Confilcts solved
authorJan Lapinkataja <jan.lapinkataja@ixonos.com>
Fri, 29 May 2009 10:07:54 +0000 (13:07 +0300)
committerJan Lapinkataja <jan.lapinkataja@ixonos.com>
Fri, 29 May 2009 10:07:54 +0000 (13:07 +0300)
commit81d3e60d0265fdb330388ed9e358b524c56ab310
treed41130d4d1da97e879fb702c016608d16527aa70
parent24cdf6f4ca42fff4f197fcedc5ac460cbb515c64
parent89e9ba5883b47a6477957ed78772828b45bc3df9
Confilcts solved

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