Merge branch 'new_panels' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 16 Aug 2010 13:05:32 +0000 (16:05 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 16 Aug 2010 13:05:32 +0000 (16:05 +0300)
commite21f5bc78100296f6de77155f3962e6d37bd3bf4
treea60e82737699cda1bf9110444f2d80dbaa5d8741
parentbc9348544300ebe03c968f4433af3db3c99a570a
parent83c81ab2f85742f0c581113c8a98062eb2ecef2d
Merge branch 'new_panels' into locationlistview

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