Merge branch 'master' of github.com:kelvan/gotoVienna
authorFlorian Schweikert <kelvan@logic.at>
Wed, 4 May 2011 13:27:58 +0000 (15:27 +0200)
committerFlorian Schweikert <kelvan@logic.at>
Wed, 4 May 2011 13:27:58 +0000 (15:27 +0200)
Conflicts:
wlSearch.py

1  2 
wlSearch.py

diff --cc wlSearch.py
@@@ -9,9 -9,10 +9,10 @@@ import urllib
  
  from parseHtml import Parser
  
+ from PySide.QtCore import Qt
  from PySide.QtDeclarative import QDeclarativeView
  
 -def QMLModel(overview):
 +def QMLModel(overview, details):
      # Mapping from the "overview" data structure to a "plain" data
      # structure to be used as model for the qml listview
      r = []