Merge branch 'master' into new_panels_with_context_buttons
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Sun, 29 Aug 2010 14:35:04 +0000 (17:35 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Sun, 29 Aug 2010 14:35:04 +0000 (17:35 +0300)
commitbbbce1cfaf349059f0f47738f44bf91bff296298
tree6559133555da39b5427ace2194d5b3175c43fb67
parent2614cfefd32cf1000a9c58d5cc2ef428cf94c3c8
parent4604419a57d599a581dff5d292dddf0076960107
Merge branch 'master' into new_panels_with_context_buttons

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