projects / situare / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a6c1a6 455c492)
Merge branch 'laitiju' into map
authorSami Rämö <sami.ramo@ixonos.com>
Thu, 1 Apr 2010 10:57:12 +0000 (13:57 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Thu, 1 Apr 2010 10:57:12 +0000 (13:57 +0300)
commitf4331f2523128a945d3178737a3aeb54d073423f
tree4124605a8bfe23ffa17fc3c34ac78a706aca46detree | snapshot
parent5a6c1a6ed5109cc4813d8a5723c36d051b6f0066commit | diff
parent455c4929f451dc0b9d6044f827e9b2bff21b92e8commit | diff
Merge branch 'laitiju' into map

Conflicts:
src/map/mapengine.cpp
src/map/mapengine.h
src/src.pro
tests/testmap/testmapscene/testmapscene.pro
tests/testmap/testmaptile/testmaptile.pro
tests/testmap/testmapview/testmapview.cpp
tests/testmap/testmapview/testmapview.pro
src/map/mapengine.cpp diff1 | diff2 | blob | history
src/map/mapengine.h diff1 | diff2 | blob | history
src/src.pro diff1 | diff2 | blob | history
Unnamed repository; edit this file to name it for gitweb.