Merge branch 'master' into map_double_click_zoom
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 18 Jun 2010 12:38:41 +0000 (15:38 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 18 Jun 2010 12:38:41 +0000 (15:38 +0300)
commit3f4c28c5e81dc2a5f28914bcfa4756818a555fc2
tree697f1d3e7bc6828e6adf41f980b1439ee8dcd6af
parenta1caae2cab33a241dc758fa0ef303c707d66394c
parentc11a5e8417ffac0d73244d9f58d0f38ac6aff46f
Merge branch 'master' into map_double_click_zoom

Conflicts:
src/src.pro
src/src.pro
src/ui/mainwindow.cpp