Merge branch 'master' into current_position_marker current_position_marker
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 17 May 2010 11:50:11 +0000 (14:50 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 17 May 2010 12:30:57 +0000 (15:30 +0300)
commit7c36fabe45951f7a239418984011da6914ecd897
tree61b18fa03e1c00d683cb399c57e3895f5ffa32c1
parent6d1af2c3a080733683b66155c17e9cbfbdaa5dd9
parentfc42b672a8d969a96456a834c055cd28bc8b39e1
Merge branch 'master' into current_position_marker

 - Reviewed by Jussi

Conflicts:
images.qrc
src/gps/gpsposition.h
src/map/mapengine.cpp
src/src.pro
src/ui/mainwindow.cpp
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h
12 files changed:
images.qrc
src/engine/engine.h
src/gps/gpsposition.cpp
src/gps/gpsposition.h
src/map/mapengine.cpp
src/map/mapengine.h
src/map/mapview.cpp
src/map/mapview.h
src/src.pro
src/ui/mainwindow.cpp
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h