Merge branch 'map' of https://vcs.maemo.org/git/situare into map
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 15 Apr 2010 11:37:44 +0000 (14:37 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 15 Apr 2010 11:37:44 +0000 (14:37 +0300)
commit946fcc94e3646a623b2f37f82cddc164a0639ea5
treeeae8bd076f78398f3e0156b9261a6bcd501116bd
parent1cd0f6c0acbd4ed05ec952af0924adfe9ff14510
parentfb68664623bb4e954ac958c107dfc96bf600ebe9
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

Conflicts:
src/map/mapengine.cpp
src/map/mapengine.h
src/map/mapview.cpp
src/map/mapview.h
src/map/mapengine.cpp
src/map/mapengine.h
src/map/mapview.cpp
tests/map/mapengine/testmapengine.cpp
tests/map/mapengine/testmapengine.pro