Fixed (yet) another merge screw-up *sigh*
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 29 Apr 2010 09:03:24 +0000 (12:03 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 29 Apr 2010 09:03:24 +0000 (12:03 +0300)
commit0e7b42f7b38c8543c74f8b7986e722245eda6d13
tree32aed31cf4718815ae387c62ebe14bda8840fc3d
parent886eea0476a6176ad754c944bb1981023b2a4564
Fixed (yet) another merge screw-up *sigh*
14 files changed:
src/map/mapcommon.h
src/map/mapengine.cpp
src/map/mapengine.h
src/map/mapfetcher.cpp
src/map/mapfetcher.h
src/map/mapscene.cpp
src/map/mapscene.h
src/map/maptile.cpp
src/map/maptile.h
src/map/mapview.cpp
src/map/mapview.h
src/situareservice/imagefetcher.h
src/src.pro
src/ui/mapviewscreen.cpp