Merge branch 'new_panels_with_context_buttons' into situare_interact
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 30 Aug 2010 06:52:14 +0000 (09:52 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 30 Aug 2010 06:52:14 +0000 (09:52 +0300)
commitd4c7a860163003d8a54f2cd52ca3cb1be608312c
tree28eaaf26648547270bc97032238ff25f84c55ab9
parent9e9da05f08918db2d35652fc61f7b114b525266e
parenta9031e3cd4c03d339520626217c41cb57d020e38
Merge branch 'new_panels_with_context_buttons' into situare_interact

Conflicts:
src/engine/engine.cpp
src/ui/userinfo.cpp
src/ui/userinfo.h
images.qrc
src/engine/engine.cpp
src/ui/friendlistpanel.cpp
src/ui/mainwindow.cpp
src/ui/userinfo.cpp
src/ui/userinfo.h
src/ui/userinfopanel.cpp
src/ui/userinfopanel.h