Merge branch 'master' into new_zoom_buttons_panel
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 14 May 2010 09:53:18 +0000 (12:53 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 14 May 2010 09:53:18 +0000 (12:53 +0300)
commit174f8d5cc21ee9c20b1e82b2aa70eb73ba0463c5
tree11ba49d5b0e1ef4b3d8cb217b91c8035e4c0e04c
parentd08a150d569a0b9dcfe4cc8f7b5daa79b45f09a4
parent5cc7fe0395da55a368702c337c8920dae345a841
Merge branch 'master' into new_zoom_buttons_panel

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