Merge branch 'qml' of https://vcs.maemo.org/git/situare into qml
authorJanne Kiiski <janne.kiiski@ixonos.com>
Fri, 12 Nov 2010 13:57:34 +0000 (15:57 +0200)
committerJanne Kiiski <janne.kiiski@ixonos.com>
Fri, 12 Nov 2010 13:57:34 +0000 (15:57 +0200)
1  2 
src/engine/engine.cpp

Simple merge