Merge branch 'qml' of https://vcs.maemo.org/git/situare into qml
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 22 Nov 2010 13:07:05 +0000 (15:07 +0200)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 22 Nov 2010 13:07:05 +0000 (15:07 +0200)
commit676f68c02a357847287fd40d25afcf845402ddce
treef7f8359799b3dcd71851e70ddd5925b84d145adb
parentf54b62c25cc3ef72d4ea07d1f22b7055cbf0bb68
parentd85e8ad3aec4e636c9398236fe87d4d7e93fef59
Merge branch 'qml' of https://vcs.maemo.org/git/situare into qml
src/engine/engine.cpp