Merge branch 'master' into map_double_click_zoom
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 17 Jun 2010 05:06:17 +0000 (08:06 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 17 Jun 2010 05:06:17 +0000 (08:06 +0300)
1  2 
src/ui/mainwindow.cpp

Simple merge