Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
authoritkonma <marko.itkonen@ixonos.com>
Tue, 26 May 2009 11:52:25 +0000 (14:52 +0300)
committeritkonma <marko.itkonen@ixonos.com>
Tue, 26 May 2009 11:52:25 +0000 (14:52 +0300)
commit56f763c68a2ff56d344ef150b7378ca417d08b36
tree75480d97aa2797c881689a1710974a303c30e4fa
parent3c310cf12a8f6516e16b7883c94478c5123e7238
parent658e4917f437e1f3bb214466ae91dc8fa0ea4705
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

Conflicts:
src/BusinessLogic/Engine.cpp
src/BusinessLogic/Engine.cpp
src/BusinessLogic/Engine.h
src/UserInterface/WindowManager.cpp