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)
commit4791f475074a90084827554f6f3bc41aee4b1e03
tree9587b85b05437e8bf328cd20de3cf905dc6f18e5
parent9cbb5ab47ea2add7cd0101dbd733ff8341c46725
parentb8f6a164c9ea29ea37a34bd65e07f64cf8ee6cbd
Merge branch 'qml' of https://vcs.maemo.org/git/situare into qml
src/engine/engine.cpp