Merge branch 'master_merge' into dev_puontsi
-rw-r--r-- 1709 QtMeetings.conf
-rw-r--r-- 298 QtMeetings.desktop
-rw-r--r-- 63421 QtMeetings.doxygen
-rw-r--r-- 5237 QtMeetings.pro
drwxr-xr-x - debian
drwxr-xr-x - resources
drwxr-xr-x - scripts
drwxr-xr-x - src
drwxr-xr-x - tests