Merge branch 'new_panels' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 12 Aug 2010 09:03:42 +0000 (12:03 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 12 Aug 2010 09:03:42 +0000 (12:03 +0300)
commit5d2febf6aa8eb2302ba5ea33c208d0b26017404d
tree27dc9570819cc2d29b72379040351308a3031ebb
parent737754780392f5b6b992f613fd088b41c0af5b99
parentcec416f9b29b70c8e53c6c29dd9441afb10888ce
Merge branch 'new_panels' into locationlistview
src/map/mapengine.cpp
src/map/mapengine.h
src/ui/friendlistpanel.cpp
src/ui/mainwindow.cpp