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

projects / situare / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 45f011d 3e621dc)

author	Katri Kaikkonen <katri.kaikkonen@ixonos.com>
	Tue, 10 Aug 2010 09:26:31 +0000 (12:26 +0300)
committer	Katri Kaikkonen <katri.kaikkonen@ixonos.com>
	Tue, 10 Aug 2010 09:26:31 +0000 (12:26 +0300)
commit	ec7d64dbe3ca77c72354ea0bc4a64725dcee7a9d
tree	fed55fa516da235cc15bcd2e8c06b23a46b14feb	tree \| snapshot
parent	45f011d73b7c528a6e940a67a7e974faec83d4f4	commit \| diff
parent	3e621dc4341351db74ac1029285f4b0af94cd30a	commit \| diff

Merge branch 'master' into indicator

Conflicts:
src/src.pro

src/engine/engine.cpp	diff1 \|	diff2 \|	blob \| history
src/engine/engine.h	diff1 \|	diff2 \|	blob \| history
src/map/mapcommon.h	diff1 \|	diff2 \|	blob \| history
src/map/mapengine.cpp	diff1 \|	diff2 \|	blob \| history
src/map/mapscene.cpp	diff1 \|	diff2 \|	blob \| history
src/map/osm.h	diff1 \|	diff2 \|	blob \| history
src/src.pro	diff1 \|	diff2 \|	blob \| history
src/ui/mainwindow.cpp	diff1 \|	diff2 \|	blob \| history
tests/coordinates/scenecoordinate/testscenecoordinate.cpp	diff1 \|	diff2 \|	blob \| history

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