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)
commitdd3890cf1ef58bc300cf1a59fe67bd226078c5af
tree2e844eab16ebd68f2925c1a58f2861a396a1d649
parentf112797cf810d336716bd01b96b28ce8b23e3961
parent05eaf7bb2fe1dc07d957cc9af96453db49de371e
Merge branch 'master' into map_double_click_zoom
src/ui/mainwindow.cpp