-
Tristan Matthews authored
Resolved Conflicts: .gitignore gnome/man/README.manpages gnome/src/dbus/instance-introspec.xml gnome/src/uimanager.c kde/AUTHORS kde/CMakeLists.txt kde/COPYING kde/ChangeLog kde/DEVELOPPER kde/Doxyfile kde/INSTALL kde/NEWS kde/README kde/VERSION kde/cmake-build/CMakeCache.txt kde/cmake-build/CMakeFiles/CMakeCCompiler.cmake kde/cmake-build/CMakeFiles/CMakeCXXCompiler.cmake kde/cmake-build/CMakeFiles/CMakeDetermineCompilerABI_C.bin kde/cmake-build/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin kde/cmake-build/CMakeFiles/CMakeDirectoryInformation.cmake kde/cmake-build/CMakeFiles/CMakeError.log kde/cmake-build/CMakeFiles/CMakeOutput.log kde/cmake-build/CMakeFiles/CMakeRuleHashes.txt kde/cmake-build/CMakeFiles/CMakeSystem.cmake kde/cmake-build/CMakeFiles/CompilerIdC/CMakeCCompilerId.c kde/cmake-build/CMakeFiles/CompilerIdC/a.out kde/cmake-build/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp kde/cmake-build/CMakeFiles/CompilerIdCXX/a.out kde/cmake-build/CMakeFiles/Makefile.cmake kde/cmake-build/CMakeFiles/Makefile2 kde/cmake-build/CMakeFiles/TargetDirectories.txt kde/cmake-build/CMakeFiles/cmake.check_cache kde/cmake-build/CMakeFiles/distclean.dir/DependInfo.cmake kde/cmake-build/CMakeFiles/distclean.dir/build.make kde/cmake-build/CMakeFiles/distclean.dir/cmake_clean.cmake kde/cmake-build/CMakeFiles/distclean.dir/progress.make kde/cmake-build/CMakeFiles/progress.marks kde/cmake-build/CMakeFiles/uninstall.dir/DependInfo.cmake kde/cmake-build/CMakeFiles/uninstall.dir/build.make kde/cmake-build/CMakeFiles/uninstall.dir/cmake_clean.cmake kde/cmake-build/CMakeFiles/uninstall.dir/progress.make kde/cmake-build/CMakeTmp/check_qt_visibility.cpp kde/cmake-build/CTestTestfile.cmake kde/cmake-build/Makefile kde/cmake-build/cmake_install.cmake kde/cmake-build/cmake_uninstall.cmake kde/cmake-build/data/CMakeFiles/CMakeDirectoryInformation.cmake kde/cmake-build/data/CMakeFiles/progress.marks kde/cmake-build/data/CTestTestfile.cmake kde/cmake-build/data/Makefile kde/cmake-build/data/cmake_install.cmake kde/cmake-build/data/icons/CMakeFiles/CMakeDirectoryInformation.cmake kde/cmake-build/data/icons/CMakeFiles/progress.marks kde/cmake-build/data/icons/CTestTestfile.cmake kde/cmake-build/data/icons/Makefile kde/cmake-build/data/icons/cmake_install.cmake kde/cmake-build/doc/CMakeFiles/CMakeDirectoryInformation.cmake kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/DependInfo.cmake kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/build.make kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/cmake_clean.cmake kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/depend.internal kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/depend.make kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/progress.make kde/cmake-build/doc/CMakeFiles/progress.marks kde/cmake-build/doc/CTestTestfile.cmake kde/cmake-build/doc/Makefile kde/cmake-build/doc/cmake_install.cmake kde/cmake-build/doc/index.cache.bz2 kde/cmake-build/install_manifest.txt kde/cmake-build/man/CMakeFiles/CMakeDirectoryInformation.cmake kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/DependInfo.cmake kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/build.make kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/cmake_clean.cmake kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/depend.internal kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/depend.make kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/progress.make kde/cmake-build/man/CMakeFiles/progress.marks kde/cmake-build/man/CTestTestfile.cmake kde/cmake-build/man/Makefile kde/cmake-build/man/cmake_install.cmake kde/cmake-build/man/index.html kde/cmake-build/po/CMakeFiles/CMakeDirectoryInformation.cmake kde/cmake-build/po/CMakeFiles/progress.marks kde/cmake-build/po/CTestTestfile.cmake kde/cmake-build/po/Makefile kde/cmake-build/po/cmake_install.cmake kde/cmake-build/po/de/CMakeFiles/CMakeDirectoryInformation.cmake kde/cmake-build/po/de/CMakeFiles/pofiles.dir/DependInfo.cmake kde/cmake-build/po/de/CMakeFiles/pofiles.dir/build.make kde/cmake-build/po/de/CMakeFiles/pofiles.dir/cmake_clean.cmake kde/cmake-build/po/de/CMakeFiles/pofiles.dir/depend.internal kde/cmake-build/po/de/CMakeFiles/pofiles.dir/depend.make kde/cmake-build/po/de/CMakeFiles/pofiles.dir/progress.make kde/cmake-build/po/de/CMakeFiles/progress.marks kde/cmake-build/po/de/CTestTestfile.cmake kde/cmake-build/po/de/Makefile kde/cmake-build/po/de/cmake_install.cmake kde/cmake-build/po/de/sflphone-client-kde.gmo kde/cmake-build/po/es/CMakeFiles/CMakeDirectoryInformation.cmake kde/cmake-build/po/es/CMakeFiles/pofiles.dir/DependInfo.cmake kde/cmake-build/po/es/CMakeFiles/pofiles.dir/build.make kde/cmake-build/po/es/CMakeFiles/pofiles.dir/cmake_clean.cmake kde/cmake-build/po/es/CMakeFiles/pofiles.dir/depend.internal kde/cmake-build/po/es/CMakeFiles/pofiles.dir/depend.make kde/cmake-build/po/es/CMakeFiles/pofiles.dir/progress.make kde/cmake-build/po/es/CMakeFiles/progress.marks kde/cmake-build/po/es/CTestTestfile.cmake kde/cmake-build/po/es/Makefile kde/cmake-build/po/es/cmake_install.cmake kde/cmake-build/po/es/sflphone-client-kde.gmo kde/cmake-build/po/fr/CMakeFiles/CMakeDirectoryInformation.cmake kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/DependInfo.cmake kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/build.make kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/cmake_clean.cmake kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/depend.internal kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/depend.make kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/progress.make kde/cmake-build/po/fr/CMakeFiles/progress.marks kde/cmake-build/po/fr/CTestTestfile.cmake kde/cmake-build/po/fr/Makefile kde/cmake-build/po/fr/cmake_install.cmake kde/cmake-build/po/fr/sflphone-client-kde.gmo kde/cmake-build/po/ru/CMakeFiles/CMakeDirectoryInformation.cmake kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/DependInfo.cmake kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/build.make kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/cmake_clean.cmake kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/depend.internal kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/depend.make kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/progress.make kde/cmake-build/po/ru/CMakeFiles/progress.marks kde/cmake-build/po/ru/CTestTestfile.cmake kde/cmake-build/po/ru/Makefile kde/cmake-build/po/ru/cmake_install.cmake kde/cmake-build/po/ru/sflphone-client-kde.gmo kde/cmake-build/po/zh_CN/CMakeFiles/CMakeDirectoryInformation.cmake kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/DependInfo.cmake kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/build.make kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/cmake_clean.cmake kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/depend.internal kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/depend.make kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/progress.make kde/cmake-build/po/zh_CN/CMakeFiles/progress.marks kde/cmake-build/po/zh_CN/CTestTestfile.cmake kde/cmake-build/po/zh_CN/Makefile kde/cmake-build/po/zh_CN/cmake_install.cmake kde/cmake-build/po/zh_CN/sflphone-client-kde.gmo kde/cmake-build/po/zh_HK/CMakeFiles/CMakeDirectoryInformation.cmake kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/DependInfo.cmake kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/build.make kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/cmake_clean.cmake kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/depend.internal kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/depend.make kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/progress.make kde/cmake-build/po/zh_HK/CMakeFiles/progress.marks kde/cmake-build/po/zh_HK/CTestTestfile.cmake kde/cmake-build/po/zh_HK/Makefile kde/cmake-build/po/zh_HK/cmake_install.cmake kde/cmake-build/po/zh_HK/sflphone-client-kde.gmo kde/cmake-build/src/CMakeFiles/CMakeDirectoryInformation.cmake kde/cmake-build/src/CMakeFiles/progress.marks kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/CXX.includecache kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/DependInfo.cmake kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/build.make kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/cmake_clean.cmake kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/depend.internal kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/depend.make kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/flags.make kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/link.txt kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/progress.make kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/DependInfo.cmake kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/build.make kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/cmake_clean.cmake kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/depend.internal kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/depend.make kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/progress.make kde/cmake-build/src/CTestTestfile.cmake kde/cmake-build/src/Makefile kde/cmake-build/src/SFLPhoneView.moc kde/cmake-build/src/SFLPhoneapplication.moc kde/cmake-build/src/callmanager_dbus_interface.cpp kde/cmake-build/src/callmanager_dbus_interface.h kde/cmake-build/src/callmanager_dbus_interface.moc kde/cmake-build/src/cmake_install.cmake kde/cmake-build/src/configurationmanager_dbus_interface.cpp kde/cmake-build/src/configurationmanager_dbus_interface.h kde/cmake-build/src/configurationmanager_dbus_interface.moc kde/cmake-build/src/instance_dbus_interface.cpp kde/cmake-build/src/instance_dbus_interface.h kde/cmake-build/src/instance_dbus_interface.moc kde/cmake-build/src/kcfg_settings.cpp kde/cmake-build/src/kcfg_settings.h kde/cmake-build/src/moc_Account.cpp kde/cmake-build/src/moc_AccountItemWidget.cpp kde/cmake-build/src/moc_AccountList.cpp kde/cmake-build/src/moc_AccountListModel.cpp kde/cmake-build/src/moc_AccountWizard.cpp kde/cmake-build/src/moc_ActionSetAccountFirst.cpp kde/cmake-build/src/moc_Call.cpp kde/cmake-build/src/moc_CallModel.cpp kde/cmake-build/src/moc_CallTreeItem.cpp kde/cmake-build/src/moc_Codec.cpp kde/cmake-build/src/moc_ConfigurationDialog.cpp kde/cmake-build/src/moc_ConfigurationSkeleton.cpp kde/cmake-build/src/moc_ContactItemWidget.cpp kde/cmake-build/src/moc_Dialpad.cpp kde/cmake-build/src/moc_SFLPhone.cpp kde/cmake-build/src/moc_SFLPhoneTray.cpp kde/cmake-build/src/moc_dlgaccounts.cpp kde/cmake-build/src/moc_dlgaddressbook.cpp kde/cmake-build/src/moc_dlgaudio.cpp kde/cmake-build/src/moc_dlgdisplay.cpp kde/cmake-build/src/moc_dlggeneral.cpp kde/cmake-build/src/moc_dlghooks.cpp kde/cmake-build/src/qrc_resources.cxx kde/cmake-build/src/sflphone-client-kde kde/cmake-build/src/sflphone-client-kde.shell kde/cmake-build/src/sflphone-client-kde_automoc.cpp kde/cmake-build/src/sflphone-client-kde_automoc.cpp.files kde/cmake-build/src/ui_SFLPhoneView_base.h kde/cmake-build/src/ui_dlgaccountsbase.h kde/cmake-build/src/ui_dlgaddressbookbase.h kde/cmake-build/src/ui_dlgaudiobase.h kde/cmake-build/src/ui_dlgdisplaybase.h kde/cmake-build/src/ui_dlggeneralbase.h kde/cmake-build/src/ui_dlghooksbase.h kde/cmake/FindKabc.cmake kde/cmake/FindQt4.cmake kde/cmake/TargetDistclean.cmake kde/config.sh kde/data/CMakeLists.txt kde/data/icons/CMakeLists.txt kde/data/icons/hi128-apps-sflphone-client-kde.png kde/data/icons/hi16-apps-sflphone-client-kde.png kde/data/icons/hi22-apps-sflphone-client-kde.png kde/data/icons/hi32-apps-sflphone-client-kde.png kde/data/icons/hi48-apps-sflphone-client-kde.png kde/data/icons/hi64-apps-sflphone-client-kde.png kde/data/icons/hisc-apps-sflphone-client-kde.svgz kde/data/icons/small/hi16-apps-sflphone-client-kde.svgz kde/data/icons/small/hi32-apps-sflphone-client-kde.svg kde/data/sflphone-client-kde.desktop kde/data/sflphone-client-kde.notifyrc kde/data/sflphone-client-kdeui.rc kde/doc/CMakeLists.txt kde/doc/advanced-use.docbook kde/doc/basic-use.docbook kde/doc/common-use.docbook kde/doc/credits.docbook kde/doc/getting-started.docbook kde/doc/index.docbook kde/doc/introduction.docbook kde/doc/introduction/introduction.html kde/doc/wizard-create-email.png kde/doc/wizard-createorregister.png kde/doc/wizard-finish.png kde/doc/wizard-register-settings.png kde/doc/wizard-register-siporiax.png kde/doc/wizard-stun.png kde/doc/wizard-welcome.png kde/man/CMakeLists.txt kde/man/sflphone-client-kde.1.docbook kde/man/sflphone-client-kde.pod kde/man/sflphone.pod kde/po/CMakeLists.txt kde/po/README kde/po/de/CMakeLists.txt kde/po/de/sflphone-client-kde.po kde/po/es/CMakeLists.txt kde/po/es/sflphone-client-kde.po kde/po/fr/CMakeLists.txt kde/po/fr/sflphone-client-kde.po kde/po/ru/CMakeLists.txt kde/po/ru/sflphone-client-kde.po kde/po/zh_CN/CMakeLists.txt kde/po/zh_CN/sflphone-client-kde.po kde/po/zh_HK/CMakeLists.txt kde/po/zh_HK/sflphone-client-kde.po kde/sflphone-client-kde.kdevelop kde/src/Account.cpp kde/src/Account.h kde/src/AccountItemWidget.cpp kde/src/AccountItemWidget.h kde/src/AccountList.cpp kde/src/AccountList.h kde/src/AccountListModel.cpp kde/src/AccountListModel.h kde/src/AccountWizard.cpp kde/src/AccountWizard.h kde/src/ActionSetAccountFirst.cpp kde/src/ActionSetAccountFirst.h kde/src/CMakeLists.txt kde/src/Call.cpp kde/src/Call.h kde/src/CallModel.cpp kde/src/CallModel.h kde/src/CallTreeItem.cpp kde/src/CallTreeItem.h kde/src/Codec.cpp kde/src/Codec.h kde/src/Contact.cpp kde/src/Contact.h kde/src/ContactItemWidget.cpp kde/src/ContactItemWidget.h kde/src/Dialpad.cpp kde/src/Dialpad.h kde/src/Item.cpp kde/src/Item.h kde/src/SFLPhone.cpp kde/src/SFLPhone.h kde/src/SFLPhoneTray.cpp kde/src/SFLPhoneTray.h kde/src/SFLPhoneView.cpp kde/src/SFLPhoneView.h kde/src/SFLPhoneapplication.cpp kde/src/SFLPhoneapplication.h kde/src/SortableCodecListWidget.cpp kde/src/SortableCodecListWidget.h kde/src/callmanager_interface_singleton.cpp kde/src/callmanager_interface_singleton.h kde/src/conf/ConfigurationDialog.cpp kde/src/conf/ConfigurationDialog.h kde/src/conf/ConfigurationSkeleton.cpp kde/src/conf/ConfigurationSkeleton.h kde/src/conf/dlgaccounts.cpp kde/src/conf/dlgaccounts.h kde/src/conf/dlgaccountsbase.ui kde/src/conf/dlgaddressbook.cpp kde/src/conf/dlgaddressbook.h kde/src/conf/dlgaddressbookbase.ui kde/src/conf/dlgaudio.cpp kde/src/conf/dlgaudio.h kde/src/conf/dlgaudiobase.ui kde/src/conf/dlgdisplay.cpp kde/src/conf/dlgdisplay.h kde/src/conf/dlgdisplaybase.ui kde/src/conf/dlggeneral.cpp kde/src/conf/dlggeneral.h kde/src/conf/dlggeneralbase.ui kde/src/conf/dlghooks.cpp kde/src/conf/dlghooks.h kde/src/conf/dlghooksbase.ui kde/src/conf/kcfg_settings.kcfgc kde/src/conf/sflphone-client-kde.kcfg kde/src/configurationmanager_interface_singleton.cpp kde/src/configurationmanager_interface_singleton.h kde/src/dbus/callmanager-introspec.xml kde/src/dbus/configurationmanager-introspec.xml kde/src/dbus/metatypes.h kde/src/icons/accept.svg kde/src/icons/add.png kde/src/icons/busy.svg kde/src/icons/call.svg kde/src/icons/current.svg kde/src/icons/dial.svg kde/src/icons/document-encrypt.svgz kde/src/icons/fail.svg kde/src/icons/hang_up.svg kde/src/icons/history.svg kde/src/icons/history2.svg kde/src/icons/hold.svg kde/src/icons/icon_accept.svg kde/src/icons/icon_call.svg kde/src/icons/icon_dialpad.svg kde/src/icons/icon_dialpad_off.svg kde/src/icons/icon_hangup.svg kde/src/icons/icon_hold.svg kde/src/icons/icon_rec.svg kde/src/icons/icon_unhold.svg kde/src/icons/icon_volume.svg kde/src/icons/icon_volume_off.svg kde/src/icons/incoming.svg kde/src/icons/led-gray.svg kde/src/icons/led-green.svg kde/src/icons/led-red.svg kde/src/icons/mailbox.svg kde/src/icons/mic.svg kde/src/icons/mic_25.svg kde/src/icons/mic_50.svg kde/src/icons/mic_75.svg kde/src/icons/missed.svg kde/src/icons/outgoing.svg kde/src/icons/rec_call.svg kde/src/icons/record.svg kde/src/icons/record_disabled.svg kde/src/icons/refuse.svg kde/src/icons/remove.png kde/src/icons/ring.svg kde/src/icons/sflphone-kde.svg kde/src/icons/sflphone-kde2.svg kde/src/icons/sflphone-kde3.svg kde/src/icons/sflphone.svg kde/src/icons/sflphone_notif.svg kde/src/icons/speaker.svg kde/src/icons/speaker_25.svg kde/src/icons/speaker_50.svg kde/src/icons/speaker_75.svg kde/src/icons/stock_person.svg kde/src/icons/transfert.svg kde/src/icons/unhold.svg kde/src/icons/user-group-properties.svgz kde/src/icons/x-office-address-book.png kde/src/instance_interface_singleton.cpp kde/src/instance_interface_singleton.h kde/src/main.cpp kde/src/qrc/resources.qrc kde/src/sflphone_const.h kde/src/typedefs.h kde/src/ui/SFLPhoneView_base.ui kde/templates/cpp kde/templates/h kde/test.config
20b697bd