Merge branch 'master' of https://vcs.maemo.org/git/situare
authorVille Tiensuu <ville.tiensuu@ixonos.com>
Wed, 26 May 2010 12:36:11 +0000 (15:36 +0300)
committerVille Tiensuu <ville.tiensuu@ixonos.com>
Wed, 26 May 2010 12:36:11 +0000 (15:36 +0300)
Conflicts:
doc/test_cases/functionality-tests.doc

1  2 
doc/test_cases/functionality-tests.doc
src/engine/engine.cpp

index e409111,9c1643d..c471008
Binary files differ
Simple merge