Merge branch 'master' into map_double_click_zoom
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 18 Jun 2010 06:15:12 +0000 (09:15 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 18 Jun 2010 06:15:12 +0000 (09:15 +0300)
commita1caae2cab33a241dc758fa0ef303c707d66394c
treeb2a6e2dec811fec97aaa66670ee619ef803178ee
parenteb46e4e24657638e73738f7babb85d8e9ab3b38b
parentb68973300bf05f75957a39e1e116469988c10a8f
Merge branch 'master' into map_double_click_zoom

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