Merge branch 'master' into gps
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 11 May 2010 10:47:48 +0000 (13:47 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 11 May 2010 10:47:48 +0000 (13:47 +0300)
commit5d5a4096a9d50a9b83206f95feea3e845e242233
tree34395c580c1e00b07d15286642ef08d8839fdf4a
parent3a147865e30a6cb82f1236a8f26f77bb77fe1de4
parent971f9371813343e6c46579e52d687df79c90586d
Merge branch 'master' into gps

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