Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
authoritkonma <marko.itkonen@ixonos.com>
Mon, 1 Jun 2009 08:45:36 +0000 (11:45 +0300)
committeritkonma <marko.itkonen@ixonos.com>
Mon, 1 Jun 2009 08:45:36 +0000 (11:45 +0300)
commit3c019b17cf2052d8fe5bdfc04a986c520ff409e7
tree649d5ba31d4a46f45ba445c18f23fc73b115a495
parent97603680c47945a85e0565c71f2e1e59eec5a9c2
parent33edea90bd097065e8c6b63cabc6b4b22c6a5d2c
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

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