vcs.maemo.org Git - situare/commit

author	Pekka Nissinen <pekka.nissinen@ixonos.com>
	Mon, 3 May 2010 14:03:20 +0000 (17:03 +0300)
committer	Pekka Nissinen <pekka.nissinen@ixonos.com>
	Mon, 3 May 2010 14:03:20 +0000 (17:03 +0300)
commit	2e76f2ebce686aeceada41516c6d79195f76913a
tree	dc985eb4c797c3ab1cb540808d20fae1c0c7c05c	tree \| snapshot
parent	b3c66486ac57c548b64c7c7d2692054a2d0a5963	commit \| diff

Merge branch 'map' to integration

26 files changed:

images.qrc		diff \| blob \| history
res/images/dummy_Avatar.png	[deleted file]	blob \| history
res/images/dummy_image.png	[deleted file]	blob \| history
res/images/situare_user.jpg	[deleted file]	blob \| history
res/images/static/testTile.png	[deleted file]	blob \| history
src/images.qrc		diff \| blob \| history
src/map/mapbutton.cpp		diff \| blob \| history
src/map/mapbutton.h		diff \| blob \| history
src/map/mapcommon.h		diff \| blob \| history
src/map/mapengine.cpp		diff \| blob \| history
src/map/mapengine.h		diff \| blob \| history
src/map/mapscene.h		diff \| blob \| history
src/map/mapview.cpp		diff \| blob \| history
src/map/mapview.h		diff \| blob \| history
src/map/mapzoompanel.cpp		diff \| blob \| history
src/map/mapzoompanel.h		diff \| blob \| history
src/map/ownlocationitem.cpp		diff \| blob \| history
src/map/ownlocationitem.h		diff \| blob \| history
src/src.pro		diff \| blob \| history
src/ui/mainwindow.cpp		diff \| blob \| history
src/ui/mainwindow.h		diff \| blob \| history
tests/map/mapengine/testmapengine.pro		diff \| blob \| history
tests/map/maptile/testmaptile.cpp		diff \| blob \| history
tests/map/ownlocationitem/testownlocationitem.cpp		diff \| blob \| history
tests/situareservice/testfetchlocations/testfetchlocations.cpp		diff \| blob \| history
tests/ui/mainwindow/mainwindow_test.pro		diff \| blob \| history

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