git.maemo.org Git - situare/commit - src/ui/mainwindow.cpp

projects / situare / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6090279 a27fdd4)

author	Kaj Wallin <kaj.wallin@ixonos.com>
	Wed, 9 Jun 2010 08:52:02 +0000 (11:52 +0300)
committer	Kaj Wallin <kaj.wallin@ixonos.com>
	Wed, 9 Jun 2010 08:52:02 +0000 (11:52 +0300)
commit	ca010e66536c99da7eafc01d24c0d12e3a852159
tree	2413ba4695275c53998b51bf0ade6aab9c5b8529	tree \| snapshot
parent	6090279e9c1ee64462d07926a9f97ed0ca699894	commit \| diff
parent	a27fdd4b93906f9c21d5e62c769244df394bfabe	commit \| diff

Merge branch 'distance_scale'

Conflicts:
src/ui/mainwindow.h

Did minor fixes to documentation. Added functional test for map scale

Reviewed by: Marko Niemelä

doc/testing/functionality-tests.doc	diff1 \|	diff2 \|	blob \| history
src/engine/engine.cpp	diff1 \|	diff2 \|	blob \| history
src/map/friendgroupitem.cpp	diff1 \|	diff2 \|	blob \| history
src/src.pro	diff1 \|	diff2 \|	blob \| history
src/ui/mainwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/ui/mainwindow.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file to name it for gitweb.