Fixed errors caused by auto merge that did not work correctly
authorMikko Siren <mikko.siren@ixonos.com>
Mon, 1 Jun 2009 06:35:48 +0000 (09:35 +0300)
committerMikko Siren <mikko.siren@ixonos.com>
Mon, 1 Jun 2009 06:35:48 +0000 (09:35 +0300)
commit91a6320c32433fd05bd20ba09dfd48548e6d2ade
tree5d8fef3072257129f414e4f47357504d42633a62
parent69d3a8d40806d5f721e8aa51d1e604822ba8180e
Fixed errors caused by auto merge that did not work correctly
src/BusinessLogic/Engine.cpp
src/BusinessLogic/Engine.h
src/BusinessLogic/UIManager.cpp
src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
src/UserInterface/Views/RoomStatusIndicatorWidget.h