Merge branch 'map' into integration
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 3 May 2010 13:13:28 +0000 (16:13 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 3 May 2010 13:13:28 +0000 (16:13 +0300)
commitb3c66486ac57c548b64c7c7d2692054a2d0a5963
tree6b4e31b8549c1b7e32d122074e687516e9881231
parent4d97d324606770b4ba4e192ebc9a1816ef23442e
parent08b738329411ebcef522174a11ee92db6d99d196
Merge branch 'map' into integration

Conflicts:
src/map/mapengine.cpp
src/map/mapengine.h
src/map/mapfetcher.cpp
src/map/mapfetcher.h
src/map/mapscene.cpp
src/map/maptile.cpp
src/map/mapview.cpp
src/src.pro
src/map/mapcommon.h
src/map/mapengine.cpp
src/map/mapengine.h
src/map/mapscene.cpp
src/src.pro
src/ui/mapviewscreen.cpp