Merge branch 'master' into listview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 19 Jul 2010 07:12:01 +0000 (10:12 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 19 Jul 2010 07:12:01 +0000 (10:12 +0300)
commitfed63ca95cc7a0ca51da0b0703c7d75f2dd40e5a
tree7243882ea3d6258f482dc355b30232ff4f584571
parent10565715a0ca791711d4a5759d13170ae532680f
parent62d3d5b4933658b2143625118f9b053dde4fec74
Merge branch 'master' into listview

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