Merge branch 'master' into dev_local
authorZoltan Papp <zoltan.papp@ixonos.com>
Mon, 1 Jun 2009 06:14:56 +0000 (09:14 +0300)
committerZoltan Papp <zoltan.papp@ixonos.com>
Mon, 1 Jun 2009 06:14:56 +0000 (09:14 +0300)
commitb50201458e621351445d5930fd98d2a33558fdad
tree6d5fcc26b8ccdd9b231fd3a9c0d270312ff01709
parentf902a21a9d18bf6f92a114f86ac4c39d00fff4dc
parentfe81ee95cd3d2341c0fb4b45add15d4d07d30f53
Merge branch 'master' into dev_local

Conflicts:
src/BusinessLogic/UIManager.h
src/BusinessLogic/Engine.cpp
src/BusinessLogic/UIManager.cpp
src/BusinessLogic/UIManager.h
src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
src/UserInterface/Views/ViewBase.cpp