Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
authorZoltan Papp <zoltan.papp@ixonos.com>
Mon, 1 Jun 2009 07:12:18 +0000 (10:12 +0300)
committerZoltan Papp <zoltan.papp@ixonos.com>
Mon, 1 Jun 2009 07:12:18 +0000 (10:12 +0300)
commit33edea90bd097065e8c6b63cabc6b4b22c6a5d2c
tree8ff490a888db2499e8a954284ee0b322c091e8cb
parentfcb810bb877a60fa126538479875420a6f199f98
parent0707d975553afcef053521d91e8f048992b9f37e
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
src/BusinessLogic/Engine.cpp
src/BusinessLogic/UIManager.cpp
src/UserInterface/Views/RoomStatusIndicatorWidget.cpp