Merge branch 'master' into pan_map
authorSami Rämö <sami.ramo@ixonos.com>
Wed, 2 Jun 2010 11:04:18 +0000 (14:04 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Wed, 2 Jun 2010 11:04:18 +0000 (14:04 +0300)
commit795686a40c909e867336235dbc82e0c4440907af
tree2560d1e4f36aa4a7c02fd83ac7d7019b7a96ef55
parentbe3c72c04f51f03b4740a0d19d1d01ce0bcb1b37
parent4263d925e02d97376367e9bb673832df035b8b6b
Merge branch 'master' into pan_map

Conflicts:
src/ui/mainwindow.cpp
src/map/mapcommon.h