Merge branch 'master' into friendlist
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 21 May 2010 13:36:19 +0000 (16:36 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 21 May 2010 13:36:19 +0000 (16:36 +0300)
commit07389ca694d21627133ae33f94706aed758f7bc8
treeb2ea4f90df3655fc4cb386f578932e28b3665355
parentdeccc932b39c1fa18ba4a9ab99a3082d549ccb0b
parent4f0d035597d479268ad8e2212b429df7d8394669
Merge branch 'master' into friendlist

Conflicts:
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
15 files changed:
src/engine/engine.cpp
src/engine/engine.h
src/map/baselocationitem.h
src/map/friendgroupitem.cpp
src/map/friendgroupitem.h
src/map/frienditemshandler.cpp
src/map/frienditemshandler.h
src/map/friendlocationitem.cpp
src/map/friendlocationitem.h
src/map/mapengine.cpp
src/map/mapengine.h
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h