projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 359afd2 3508389)
Merge branch 'map' of https://vcs.maemo.org/git/situare into map
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 16 Apr 2010 13:06:56 +0000 (16:06 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 16 Apr 2010 13:06:56 +0000 (16:06 +0300)
Conflicts:
src/images.qrc

1  2 
src/map/mapengine.h patch | diff1 | diff2 | blob | history
src/ui/mapviewscreen.cpp patch | diff1 | diff2 | blob | history

diff --cc src/map/mapengine.h
Simple merge
diff --cc src/ui/mapviewscreen.cpp
Simple merge
Unnamed repository; edit this file to name it for gitweb.