Merge branch 'master' into master_merge
authorSimo Puonti <Simo.Puonti@ixonos.com>
Thu, 28 May 2009 05:49:58 +0000 (08:49 +0300)
committerSimo Puonti <Simo.Puonti@ixonos.com>
Thu, 28 May 2009 05:49:58 +0000 (08:49 +0300)
1  2 
QtMeetings.pro

diff --cc QtMeetings.pro
Simple merge