Merge branch 'new_panels' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 12 Aug 2010 05:40:00 +0000 (08:40 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 12 Aug 2010 05:40:00 +0000 (08:40 +0300)
commit03a2f5801d3f1517954c5e3dd6bdece7793abf87
treeb09cc398305f4b91dd0b44c8652d04ecc051ad4c
parentfd7e46af213cf0c7f020bd849977c4c86298d735
parentfb4162c58358bca9ff01b3a858189483295b3265
Merge branch 'new_panels' into locationlistview

Conflicts:
src/map/mapengine.cpp
src/src.pro
src/ui/friendlistpanel.cpp
src/engine/engine.cpp
src/engine/engine.h
src/map/mapengine.cpp
src/map/mapengine.h
src/src.pro
src/ui/friendlistpanel.cpp
src/ui/mainwindow.cpp
src/ui/mainwindow.h