Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 19 May 2010 10:38:12 +0000 (13:38 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 19 May 2010 10:38:12 +0000 (13:38 +0300)
commit3a1c5f665d98132a7816b9a26f9a6bbcff6bf74c
treef5cb0a31d63d3659fe59a4b3214d945c0c87dec4
parentf454c7789aecd86e483cfbca13aa456a1624efda
parent0334319218fe8501b128db74d3d0ec6a417c8b25
Merge branch 'master' of https://vcs.maemo.org/git/situare
src/engine/engine.cpp
src/engine/engine.h