Merge branch 'qml' of https://vcs.maemo.org/git/situare into qml
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 22 Nov 2010 15:39:19 +0000 (17:39 +0200)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 22 Nov 2010 15:39:19 +0000 (17:39 +0200)
commit604e94f43ff059dda5033dd60899af5bb2bfbf6d
tree4934b69d37349151ecacf9b8db313f279a5ee2b3
parenta223368c104de3c6ed90781ec5a32c942fca4b71
parenta95064c01afb734e5ae5c621f82279c8508da6f5
Merge branch 'qml' of https://vcs.maemo.org/git/situare into qml

Conflicts:
src/qmlui/res.qrc
src/src.pro
src/qmlui/res.qrc
src/src.pro