projects / situare / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 27bf594 3e0691f)
Merge branch 'move_map_engine' (NOT FINISHED!)
authorSami Rämö <sami.ramo@ixonos.com>
Fri, 21 May 2010 10:32:48 +0000 (13:32 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Fri, 21 May 2010 10:32:48 +0000 (13:32 +0300)
commit18ad2f59369a4adc51f5d785fc46c601ea4f8048
treeccde1a3c400cacfb9cc71284fbecb1f068c89e9btree | snapshot
parent27bf5947e07aed8807684f8bdb49ebbee6c4af34commit | diff
parent3e0691f0e619cd85f3320a1a77e00720238cd992commit | diff
Merge branch 'move_map_engine' (NOT FINISHED!)

Conflicted files checkouted from move_map_engine branch.
Still requiring manual merge of master branch changes.

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