Merge branch 'new_panels' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 16 Aug 2010 05:43:36 +0000 (08:43 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 16 Aug 2010 05:43:36 +0000 (08:43 +0300)
commit943b661d9145d4d604fdc088ba171340eea2aa68
tree36bcf768966dc862c051e6b56e7fdb101887880f
parent9dafdc6d4030ec985420478ad0b0251d8df04e77
parentfd572b44ecfe404157623700c56d9c3adcbe7221
Merge branch 'new_panels' into locationlistview

Conflicts:
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/mainwindow.h
tests/ui/friendlistitem/testfriendlistitem.cpp
tests/ui/listview/testlistview.cpp
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h
tests/ui/friendlistitem/testfriendlistitem.cpp