Merge branch 'map' of https://vcs.maemo.org/git/situare into map
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 13 Apr 2010 12:42:16 +0000 (15:42 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 13 Apr 2010 12:42:16 +0000 (15:42 +0300)
commitd29af2bc1cf74d418b9fd7403713237438b4e51a
tree80e2d5b9948fd869e6eecde2b60471d4fc197534
parent36c45944d210a5609417ab21d5c1ba9c24e9b826
parentb4962a4af0b3e6e21f0691692ce373b5955322e9
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

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