Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
authoritkonma <marko.itkonen@ixonos.com>
Mon, 1 Jun 2009 06:09:24 +0000 (09:09 +0300)
committeritkonma <marko.itkonen@ixonos.com>
Mon, 1 Jun 2009 06:09:24 +0000 (09:09 +0300)
commit97603680c47945a85e0565c71f2e1e59eec5a9c2
tree54f537d516aa029ad3904a2f24d99e1e46a11a4c
parent904796ae12788d3192c28fb259c96f92c14cbb9c
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

Conflicts:
src/BusinessLogic/UIManager.h
17 files changed:
resources/xml/errortable.xml
src/BusinessLogic/Engine.cpp
src/BusinessLogic/Engine.h
src/BusinessLogic/UIManager.cpp
src/BusinessLogic/UIManager.h
src/IO/Communication/CommunicationManager.cpp
src/IO/DeviceControl/DeviceConfigurator.cpp
src/IO/DeviceControl/DeviceManager.cpp
src/IO/DeviceControl/DeviceManager.h
src/IO/DeviceControl/HWKeyListener.cpp
src/IO/DeviceControl/OperationModeToggler.cpp
src/UserInterface/Utils/PasswordDialog.cpp
src/UserInterface/Utils/PasswordDialog.h
src/UserInterface/Utils/ProgressBar.cpp
src/UserInterface/Utils/ProgressBar.h
src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
src/UserInterface/Views/RoomStatusIndicatorWidget.h