Merge branch 'master' into current_position_marker
authorSami Rämö <sami.ramo@ixonos.com>
Fri, 14 May 2010 09:36:41 +0000 (12:36 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Fri, 14 May 2010 09:36:41 +0000 (12:36 +0300)
commit56ab57a713c906cf8af9343943397fc306d53136
treed8886c7011de12c4c296cfc808c8d7201f3c94c6
parentd86ec4212711cbfffdede4f20bec78ebd0996d9d
parent5cc7fe0395da55a368702c337c8920dae345a841
Merge branch 'master' into current_position_marker

Conflicts:
images.qrc
src/map/mapengine.cpp
src/map/mapengine.h
src/src.pro
src/map/mapengine.cpp
src/map/mapengine.h
src/src.pro