Merge branch 'fix_userinfo' into userinfo_collapse, review and fixes
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 27 Aug 2010 12:37:21 +0000 (15:37 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 27 Aug 2010 12:37:21 +0000 (15:37 +0300)
commitf4d35a5ccb86127d44aa73d44349773b0d4f3ed1
tree31345ad8909b72b9bc96a9b2a27ddf1448fff6fe
parentf7d834953729f5591a9589549b34d9461791b7db
parent6ffa9a4734575fd34f7f88c17216948ffdb7b6f9
Merge branch 'fix_userinfo' into userinfo_collapse, review and fixes
Reviewed by Sami Rämö

Conflicts:
src/ui/userinfo.cpp
src/ui/mainwindow.cpp
src/ui/userinfo.cpp
src/ui/userinfo.h
src/ui/userinfopanel.cpp
src/ui/userinfopanel.h