Merge branch 'master' into dev_local
authorZoltan Papp <zoltan.papp@ixonos.com>
Mon, 1 Jun 2009 06:41:31 +0000 (09:41 +0300)
committerZoltan Papp <zoltan.papp@ixonos.com>
Mon, 1 Jun 2009 06:41:31 +0000 (09:41 +0300)
commitb1a79d56592e493c6206a198883caadca7bc74b0
tree4b60a6f6f1fae64e2ff83c17d4195170db995996
parentd55ef6107c9686154496d0d4f9f93806c4c80d8a
parent91a6320c32433fd05bd20ba09dfd48548e6d2ade
Merge branch 'master' into dev_local
src/BusinessLogic/Engine.cpp
src/BusinessLogic/Engine.h
src/BusinessLogic/UIManager.cpp
src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
src/UserInterface/Views/RoomStatusIndicatorWidget.h