Merge branch 'map' of https://vcs.maemo.org/git/situare into map

author Sami Rämö <sami.ramo@ixonos.com>

Mon, 12 Apr 2010 09:32:16 +0000 (12:32 +0300)

committer Sami Rämö <sami.ramo@ixonos.com>

Mon, 12 Apr 2010 09:32:16 +0000 (12:32 +0300)
author Sami Rämö <sami.ramo@ixonos.com>
Mon, 12 Apr 2010 09:32:16 +0000 (12:32 +0300)
committer Sami Rämö <sami.ramo@ixonos.com>
Mon, 12 Apr 2010 09:32:16 +0000 (12:32 +0300)
diff --cc src/common.h
Simple merge
diff --cc src/map/mapview.cpp
Simple merge
diff --cc src/map/mapview.h
Simple merge
diff --cc src/ui/mapviewscreen.cpp
Simple merge
author	Sami Rämö <sami.ramo@ixonos.com>
	Mon, 12 Apr 2010 09:32:16 +0000 (12:32 +0300)
committer	Sami Rämö <sami.ramo@ixonos.com>
	Mon, 12 Apr 2010 09:32:16 +0000 (12:32 +0300)
		1	2
src/common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/map/mapview.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/map/mapview.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/mapviewscreen.cpp	patch \|	diff1 \|	diff2 \|	blob \| history