Merge branch 'master' into pan_map
authorSami Rämö <sami.ramo@ixonos.com>
Wed, 9 Jun 2010 06:46:26 +0000 (09:46 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Wed, 9 Jun 2010 06:46:26 +0000 (09:46 +0300)
commit3fe09d8cdd45dd23f04f58dcbe1170671773cb4d
tree75c4204ac92c4c5ed4799674816b9f9f9067b686
parentc1494ffea8840c098faa6e8d22bd38e06851caf6
parent423891cc453c0034c5c145959c57c751878e3b05
Merge branch 'master' into pan_map

Conflicts:
src/map/mapengine.h
src/map/mapengine.cpp
src/map/mapengine.h
src/map/mapfetcher.cpp