Merge branch 'map' of https://vcs.maemo.org/git/situare into map
authorSami Rämö <sami.ramo@ixonos.com>
Thu, 29 Apr 2010 07:15:15 +0000 (10:15 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Thu, 29 Apr 2010 07:15:15 +0000 (10:15 +0300)
commit6ab56728506182777f40a51f09c6c552b6ad90e3
treea34a762b6582352c2f500933162901912de3f20c
parentb32ec54eb932f66b1576701d496f6dd1f4f5c069
parent32d6529a9bb00de1b173cb1ecb2e3694925ffc52
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

Conflicts:
src/src.pro
src/map/mapcommon.h
src/map/mapfetcher.cpp
src/src.pro
src/ui/mapviewscreen.cpp