Merge branch 'new_panels' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 11 Aug 2010 08:04:02 +0000 (11:04 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 11 Aug 2010 08:04:02 +0000 (11:04 +0300)
commita1f040cca253e98f84830bdba5adc0f5082d1f8d
tree808242d6475945d470e608075e5ec920b84ca8bf
parentc0423d0f0841f5487ce5af11644b83f61ea4f710
parente37aa842506571bc52236b22cf4d4b2343397803
Merge branch 'new_panels' into locationlistview

Conflicts:
src/src.pro
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/listcommon.h
src/ui/mainwindow.cpp
src/src.pro
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/listcommon.h
src/ui/mainwindow.h