Merge branch 'dev' into map
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 29 Apr 2010 07:59:25 +0000 (10:59 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 29 Apr 2010 07:59:25 +0000 (10:59 +0300)
commit8a0096e4e52a2bfa3d7a277afbf935ecb67e8106
tree185a4e23824d33e7b53093395ab7527308781fe7
parent7f56952ff1b2e9539bfabf0708d809dd3187b8dc
parentecf7f3d144b4c83868aa56b634850d9604839402
Merge branch 'dev' into map

Conflicts:
src/map/mapview.cpp
src/src.pro
src/ui/mainwindow.cpp
src/map/mapcommon.h
src/map/mapengine.cpp
src/map/mapengine.h
src/src.pro
src/ui/mainwindow.cpp