Merge branch 'master' into new_info_panels
authorKaj Wallin <kaj.wallin@ixonos.com>
Tue, 18 May 2010 05:30:52 +0000 (08:30 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Tue, 18 May 2010 05:30:52 +0000 (08:30 +0300)
commit920bf100461b0be3844364533fe4e75172bfc1fe
treeabb4aba68d2daafe90f83abfaa52ac35cf5ff90c
parent4f2d0ff8073ce8f628a72d5ecd80f1e27a652b91
parenta47eea7415812a4cd335d296406ba1375588f560
Merge branch 'master' into new_info_panels

Conflicts:
images.qrc
images.qrc
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/panelsliderbar.cpp
src/ui/userpanel.cpp
src/ui/userpanel.h