Merge branch 'master' into stacked_friends
authorSami Rämö <sami.ramo@ixonos.com>
Thu, 6 May 2010 09:21:19 +0000 (12:21 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Thu, 6 May 2010 09:21:19 +0000 (12:21 +0300)
commit3f2ca614141c4deb7e2d8d31e9107924c35c23d8
tree26e8bcfa0aaf7e1dc7cd84afc6283c4d2c89a4d3
parent1401cb1c0f4ddd01a189a14393addd7ca7b96689
parent96b6f59cb6704ef046f86fa4b65df5c9470ca55d
Merge branch 'master' into stacked_friends

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