Merge branch 'new_panels' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 11 Aug 2010 08:04:34 +0000 (11:04 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 11 Aug 2010 08:04:34 +0000 (11:04 +0300)
commit13d7cf1f7dc07d3c736f9217a21f9128be8f2c8c
tree24c0762cf3493ed647528f4d252e46d5718fec70
parenta1f040cca253e98f84830bdba5adc0f5082d1f8d
parent094e00d88dbd67b376855029d8a4f35e567bb2fa
Merge branch 'new_panels' into locationlistview
src/ui/friendlistpanel.cpp
src/ui/mainwindow.h