Merge branch 'map' of https://vcs.maemo.org/git/situare into map
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 15 Apr 2010 11:05:59 +0000 (14:05 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 15 Apr 2010 11:05:59 +0000 (14:05 +0300)
commit1cd0f6c0acbd4ed05ec952af0924adfe9ff14510
tree9e05113efbfadd7369e61e0039ad4cffc9a636e0
parent5280c87dea0ae765fddcce41abd46aee2f7296f3
parent0c5c42bb7625adfe63db20fdbbd251b7b1d23b3b
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

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