Merge branch 'map' of https://vcs.maemo.org/git/situare into map
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 9 Apr 2010 12:44:44 +0000 (15:44 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 9 Apr 2010 12:44:44 +0000 (15:44 +0300)
commit9940a61532ecd1746bc34e0c5268370c9a21cca6
tree4e982c2e5535bf76381718dec85dacd8344a0184
parent29e988966405c5757772aea43e8b36210c303a30
parente5462734243a9d9dffce58bbbe1d4e1f72fb977f
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

Conflicts:
src/map/mapengine.cpp
src/map/mapengine.cpp
src/map/mapengine.h
src/ui/mapviewscreen.cpp