Merge branch 'master' of github.com:kelvan/gotoVienna
authorFlorian Schweikert <kelvan@logic.at>
Wed, 14 Mar 2012 22:39:37 +0000 (23:39 +0100)
committerFlorian Schweikert <kelvan@logic.at>
Wed, 14 Mar 2012 22:39:37 +0000 (23:39 +0100)
commitec5e6afed4ebefcd4ea8a234fdd82b7d6e231a3f
tree2e371c78670e9cbe00a432cec6406faa28de43f5
parent838be31a8f4acb994f2e141873188a0f4b959178
parent9a177bafb6b6dd59ede41603d87badb3702a8f2c
Merge branch 'master' of github.com:kelvan/gotoVienna

Conflicts:
gotovienna-qml
gotovienna-qml
qml/MapView.qml
qml/ResultRealtime.qml