Merge branch 'master' into dev_local
authorZoltan Papp <zoltan.papp@ixonos.com>
Mon, 1 Jun 2009 06:16:11 +0000 (09:16 +0300)
committerZoltan Papp <zoltan.papp@ixonos.com>
Mon, 1 Jun 2009 06:16:11 +0000 (09:16 +0300)
commit270286b17231aedeedd0bd4b3fa7db7b65f7c9da
treea8783d4d59e42b6581eb0c98d47bf7945f40eee2
parentb50201458e621351445d5930fd98d2a33558fdad
parent81d3e60d0265fdb330388ed9e358b524c56ab310
Merge branch 'master' into dev_local
src/BusinessLogic/Engine.cpp
src/BusinessLogic/Engine.h
src/BusinessLogic/UIManager.cpp
src/BusinessLogic/UIManager.h
src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
src/UserInterface/Views/RoomStatusIndicatorWidget.h