projects / situare / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a47eea7 12507ec)
Merge branch 'crosshair2'
authorVille Tiensuu <ville.tiensuu@ixonos.com>
Tue, 18 May 2010 05:06:43 +0000 (08:06 +0300)
committerVille Tiensuu <ville.tiensuu@ixonos.com>
Tue, 18 May 2010 05:06:43 +0000 (08:06 +0300)
commit87318a3803940618990852119385455543ad1dc1
treee2489d88971de76afb121a4f013fdc37408163bctree | snapshot
parenta47eea7415812a4cd335d296406ba1375588f560commit | diff
parent12507ecd4e94cb6f9082bb124f2a3bdf35d3db0bcommit | diff
Merge branch 'crosshair2'

Conflicts:
images.qrc
src/engine/engine.h
src/map/mapengine.cpp
src/map/mapview.cpp
src/map/mapview.h
src/ui/mainwindow.cpp
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h
images.qrc diff1 | diff2 | blob | history
src/engine/engine.h diff1 | diff2 | blob | history
src/map/mapengine.cpp diff1 | diff2 | blob | history
src/map/mapengine.h diff1 | diff2 | blob | history
src/map/mapview.cpp diff1 | diff2 | blob | history
src/map/mapview.h diff1 | diff2 | blob | history
src/ui/mainwindow.cpp diff1 | diff2 | blob | history
src/ui/mapviewscreen.cpp diff1 | diff2 | blob | history
src/ui/mapviewscreen.h diff1 | diff2 | blob | history
Unnamed repository; edit this file to name it for gitweb.