Merge branch 'master' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 3 Aug 2010 09:02:02 +0000 (12:02 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 3 Aug 2010 09:02:02 +0000 (12:02 +0300)
commit76be75fcd2e62f58e1544865d2a92a296e3e40ba
treecdd4f320347e35089a722a0c7306e22373180dfa
parent1b8d7b9d675bfe103b3a971f034090e54809584c
parent39a1b59046811e667d36a05661ad8bc4b974efef
Merge branch 'master' into locationlistview

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