Merge branch 'map' of https://vcs.maemo.org/git/situare into map
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 16 Apr 2010 13:06:56 +0000 (16:06 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 16 Apr 2010 13:06:56 +0000 (16:06 +0300)
commit62b4e9faf9d64c431ba1ff3939ab6a3f6348090f
treeba7b522740b70a95a4536b26d9ca9f62d2c9b698
parent359afd265fc3742e0581647797b5d2bf08347b2e
parent3508389b04b6b72a8511f6eff26c472bde451555
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

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