Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
authorJan Lapinkataja <jan.lapinkataja@ixonos.com>
Fri, 22 May 2009 08:00:10 +0000 (11:00 +0300)
committerJan Lapinkataja <jan.lapinkataja@ixonos.com>
Fri, 22 May 2009 08:00:10 +0000 (11:00 +0300)
commit2eebc42d218be8d6297cf9de800afa0815d2c2e2
tree551d030d791b7984edb4322f26816411bbdd1a59
parentddaeaa85dc39c1e67fae142677adbce94965c1e7
parentbea7a9d65db861efdaf4fe2ac8a8e9dd9cda3d4c
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

Conflicts:
src/UserInterface/Utils/ProgressBar.cpp