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

projects / situare / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7997964 39a1b59)

author	Katri Kaikkonen <katri.kaikkonen@ixonos.com>
	Mon, 2 Aug 2010 13:46:46 +0000 (16:46 +0300)
committer	Katri Kaikkonen <katri.kaikkonen@ixonos.com>
	Mon, 2 Aug 2010 13:46:46 +0000 (16:46 +0300)
commit	806b3f6b21d22d17c8dde04036c6f11329d26e7a
tree	621c4439203172d68016714a83bbb8b743106795	tree \| snapshot
parent	79979646429a2c7df5495caa9d3f26ce4637c520	commit \| diff
parent	39a1b59046811e667d36a05661ad8bc4b974efef	commit \| diff

Merge branch 'master' into indicator

Conflicts:
src/map/mapengine.cpp
src/ui/indicatorbutton.cpp
src/ui/mainwindow.cpp

13 files changed:

src/coordinates/geocoordinate.cpp	diff1 \|	diff2 \|	blob \| history
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/mapengine.h	diff1 \|	diff2 \|	blob \| history
src/map/mapscene.cpp	diff1 \|	diff2 \|	blob \| history
src/map/mapscene.h	diff1 \|	diff2 \|	blob \| history
src/src.pro	diff1 \|	diff2 \|	blob \| history
src/ui/indicatorbutton.cpp	diff1 \|	diff2 \|	blob \| history
src/ui/indicatorbutton.h	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.