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

author Katri Kaikkonen <katri.kaikkonen@ixonos.com>

Fri, 3 Sep 2010 13:10:19 +0000 (16:10 +0300)

committer Katri Kaikkonen <katri.kaikkonen@ixonos.com>

Fri, 3 Sep 2010 13:10:19 +0000 (16:10 +0300)
author Katri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 3 Sep 2010 13:10:19 +0000 (16:10 +0300)
committer Katri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 3 Sep 2010 13:10:19 +0000 (16:10 +0300)
diff --cc src/ui/mainwindow.cpp
Simple merge
diff --cc src/ui/userinfopanel.cpp
Simple merge
author	Katri Kaikkonen <katri.kaikkonen@ixonos.com>
	Fri, 3 Sep 2010 13:10:19 +0000 (16:10 +0300)
committer	Katri Kaikkonen <katri.kaikkonen@ixonos.com>
	Fri, 3 Sep 2010 13:10:19 +0000 (16:10 +0300)
		1	2
src/ui/mainwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/userinfopanel.cpp	patch \|	diff1 \|	diff2 \|	blob \| history