Merge branch 'qml' of https://vcs.maemo.org/git/situare into qml
authorSami Rämö <sami.ramo@ixonos.com>
Wed, 17 Nov 2010 14:33:34 +0000 (16:33 +0200)
committerSami Rämö <sami.ramo@ixonos.com>
Wed, 17 Nov 2010 14:33:34 +0000 (16:33 +0200)
1  2 
src/engine/engine.cpp

Simple merge