Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
authorJan Lapinkataja <jan.lapinkataja@ixonos.com>
Wed, 27 May 2009 10:26:33 +0000 (13:26 +0300)
committerJan Lapinkataja <jan.lapinkataja@ixonos.com>
Wed, 27 May 2009 10:26:33 +0000 (13:26 +0300)
commit47ed106398a5c3ac172e2ea7cc5fb983649d18cf
treeec0ed5cf36c0be2899f04844ec8671778a93561c
parent6b92cf1ffe7ca6ffacf6740e7e8456c72cff899d
parent56f763c68a2ff56d344ef150b7378ca417d08b36
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

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