Merge branch 'master' into map_double_click_zoom
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 22 Jun 2010 12:40:05 +0000 (15:40 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 22 Jun 2010 12:40:05 +0000 (15:40 +0300)
commit979ff655fedc4d057321debc43743b5c9a8abe33
tree0c962a8cca5a8d0431e2f691871f89820ee33ab6
parent3f4c28c5e81dc2a5f28914bcfa4756818a555fc2
parentea25ea6dc3a3506d5c7c492655d967affdd01e45
Merge branch 'master' into map_double_click_zoom

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