Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
authorOssi Jormakka <ossi.jormakka@ixonos.com>
Wed, 20 May 2009 08:06:13 +0000 (11:06 +0300)
committerOssi Jormakka <ossi.jormakka@ixonos.com>
Wed, 20 May 2009 08:06:13 +0000 (11:06 +0300)
commitf3338cdb2e117f0809a682eea7613c6e4a2ae199
treec36be3523e5146ad154a2b903616a3ca5ddb69fb
parent5810de08d3a5b5311ba1b4175fba51072aa0e754
parent539913d9d0faa7a45787aa551f802b5ce68a1619
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

Conflicts:
QtMeetings.pro
src/main.cpp
QtMeetings.pro
src/main.cpp