Merge branch 'map' of https://vcs.maemo.org/git/situare into map
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 12 Apr 2010 07:41:17 +0000 (10:41 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 12 Apr 2010 07:41:17 +0000 (10:41 +0300)
commitfe35e53101de035e8e53369e78866a1edf5526ed
tree8fce3a1842d54f041cfb7c8d95f1f40e4f1fa2e1
parent2d412356cc46e053f9fcbf8d7a32d20f1db23b35
parent0f1569c8c1456709c492843248d4248cf603cc54
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/map/mapview.h
src/ui/mapviewscreen.cpp