Merge branch 'master' into new_panels
authorSami Rämö <sami.ramo@ixonos.com>
Fri, 13 Aug 2010 10:33:04 +0000 (13:33 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Fri, 13 Aug 2010 10:33:26 +0000 (13:33 +0300)
commit9e9f8114f23c57386153e409c7edc28633bebe77
treebdbc0786d8bf78a27adaa0a96db435c780f9625c
parentca9899a9cb0a179d7cd59f504f8995245dd6696b
parent13945e56eb58580768f9663749b0c5e05a48963a
Merge branch 'master' into new_panels

Conflicts:
src/ui/friendlistpanel.h
src/ui/sidepanel.cpp
src/ui/tabbedpanel.h
src/ui/userinfo.cpp
src/ui/userinfopanel.h
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/mainwindow.cpp
src/ui/tabbedpanel.cpp
src/ui/tabbedpanel.h
src/ui/userinfo.cpp
src/ui/userinfopanel.cpp
src/ui/userinfopanel.h