Merge branch 'kinetic'

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

Wed, 23 Jun 2010 10:29:11 +0000 (13:29 +0300)

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

Wed, 23 Jun 2010 10:29:11 +0000 (13:29 +0300)
author Sami Rämö <sami.ramo@ixonos.com>
Wed, 23 Jun 2010 10:29:11 +0000 (13:29 +0300)
committer Sami Rämö <sami.ramo@ixonos.com>
Wed, 23 Jun 2010 10:29:11 +0000 (13:29 +0300)
diff --cc src/map/mapview.cpp
Simple merge
diff --cc src/map/mapview.h
Simple merge
author	Sami Rämö <sami.ramo@ixonos.com>
	Wed, 23 Jun 2010 10:29:11 +0000 (13:29 +0300)
committer	Sami Rämö <sami.ramo@ixonos.com>
	Wed, 23 Jun 2010 10:29:11 +0000 (13:29 +0300)
		1	2
src/map/mapview.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/map/mapview.h	patch \|	diff1 \|	diff2 \|	blob \| history