Merge branch 'master' into dev_local
authorZoltan Papp <zoltan.papp@ixonos.com>
Thu, 28 May 2009 10:08:16 +0000 (13:08 +0300)
committerZoltan Papp <zoltan.papp@ixonos.com>
Thu, 28 May 2009 10:08:16 +0000 (13:08 +0300)
commitfca5bd9a27f0bbb3c60ae13218a503c5df26c897
treef6279adc9ab153b5a34a0c3aab5d15990adf4912
parent5154dd6e4e1c1f746bddf3e1e6661a32a15d2b67
parentbd153701307613c96e7bdf070cf32b0cbc6ae834
Merge branch 'master' into dev_local

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