git.maemo.org Git - situare/commit - src/engine/engine.cpp

projects / situare / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 75be92e b9c5c36)

author	Jussi Laitinen <jupe@l3l7588.ixonos.local>
	Wed, 28 Jul 2010 14:20:14 +0000 (17:20 +0300)
committer	Jussi Laitinen <jupe@l3l7588.ixonos.local>
	Wed, 28 Jul 2010 14:20:14 +0000 (17:20 +0300)
commit	d1fc1c3cc420e1d8428045de2f5cf2b249ea4296
tree	2c8d0353d656961110addfa414f354bdcdbb3e52	tree \| snapshot
parent	75be92e263ef929e751287cded98f2d27cc7de6b	commit \| diff
parent	b9c5c36f7c1ee087d79d588d221702dd20fde32c	commit \| diff

Merge branch 'master' into locationlistview

Conflicts:
src/ui/mainwindow.h

14 files changed:

src/engine/engine.cpp	diff1 \|	diff2 \|	blob \| history
src/map/mapengine.cpp	diff1 \|	diff2 \|	blob \| history
src/map/mapengine.h	diff1 \|	diff2 \|	blob \| history
src/src.pro	diff1 \|	diff2 \|	blob \| history
src/ui/friendlistpanel.cpp	diff1 \|	diff2 \|	blob \| history
src/ui/friendlistpanel.h	diff1 \|	diff2 \|	blob \| history
src/ui/listview.cpp	diff1 \|	diff2 \|	blob \| history
src/ui/listview.h	diff1 \|	diff2 \|	blob \| history
src/ui/locationlistitem.cpp	diff1 \|	\|	blob \| history
src/ui/locationlistitem.h	diff1 \|	\|	blob \| history
src/ui/locationlistview.cpp	\|	\|	blob
src/ui/locationlistview.h	\|	\|	blob
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.