Merge branch 'master' of https://vcs.maemo.org/git/situare into list_panel
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 10 May 2010 12:08:20 +0000 (15:08 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 10 May 2010 12:08:20 +0000 (15:08 +0300)
commit91d0b2de029c5a9fbbe3a4e28acd71242b2049a8
tree5bcfbdca1965cb58083c216a3484d0ea82fda9c8
parent0195af386a07fc778c6d6fa89f7853950830e111
parentee888a12aef2b64b05d2a575380e448ffce76cce
Merge branch 'master' of https://vcs.maemo.org/git/situare into list_panel

Conflicts:
src/src.pro
images.qrc
src/src.pro
src/ui/avatarimage.cpp
src/ui/avatarimage.h
src/ui/friendlistitem.cpp
src/ui/friendlistitem.h
src/ui/friendlistpanel.cpp
src/ui/infotab.cpp
tests/ui/friendlist/testfriendlist.cpp
tests/ui/friendlist/testfriendlist.pro