93843c34da
daemon: cleanup for release
...
Refs #69286
Change-Id: Ic6480d24dfa143d69bc832f024fb6f6467df9b05
2015-03-25 15:52:54 -04:00
8507024c70
daemon: move up daemon into top directory
...
Refs #68986
Change-Id: Ia95b140e4f4d6625d1df12d52a40414482b2e773
2015-03-20 15:56:31 -04:00
e7e954cf44
updated gitignore
...
Change-Id: I68127d7287bba4b4faa89af8e3446fce058aae68
2014-11-20 10:57:44 -05:00
9548423f80
OSX: Audio output works using default output
...
Refs #57721
Change-Id: Ib038b25ad82047092d6dfb466495e6c3275934b2
2014-11-20 10:42:32 -05:00
4ed5a895fa
.gitignore: add exe
...
Refs #56437
Change-Id: I1b8dd62c5e94683a609ecbdea7379f2b3cfac1ec
2014-10-08 12:19:02 -04:00
b1ca3ca9d4
build-system: keep a spec file in the tarball
...
Refs #49953
Change-Id: I7f618d6d3b50d9e658249425903fca630d2978f6
2014-07-07 17:15:49 -04:00
238efd3c25
daemon: updated gitignore files
2013-07-17 17:01:12 -04:00
944d4eb65c
Merge branch 'master' into merge-upstream
...
Conflicts:
daemon/src/sip/sipvoiplink.cpp
2013-06-25 14:48:02 -04:00
af08e908f6
* #25974 : pjsip: added configure script to tree
2013-06-19 17:02:03 -04:00
e88abd603a
#14652 : ignore callmanager_wrap.h
2012-09-14 17:07:17 -04:00
6f8f4ce5b3
#15414 : Generate SWIG JNI interface for basic functions
2012-09-12 12:17:03 -04:00
eda07fa6c7
#14399 : ignore exuberant ctags
2012-09-11 15:42:02 -04:00
d47564e88c
Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview
...
Resolved Conflicts:
daemon/src/account.cpp
daemon/src/audio/audiortp/audio_rtp_session.h
daemon/src/sip/sipvoiplink.cpp
gnome/src/accountlist.h
gnome/src/actions.c
gnome/src/codeclist.c
gnome/src/codeclist.h
gnome/src/config/accountconfigdialog.c
gnome/src/config/audioconf.c
gnome/src/dbus/dbus.c
gnome/tests/Makefile.am
2012-04-03 12:02:43 -04:00
0db8a5677b
gitignore: ignore cscope/ctags files
2012-04-02 17:52:25 -04:00
a4312b037d
Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview
...
Resolved Conflicts:
daemon/configure.ac
daemon/src/dbus/callmanager.cpp
daemon/src/global.h
gnome/src/Makefile.am
gnome/src/actions.c
gnome/src/config/accountconfigdialog.c
gnome/src/config/audioconf.c
gnome/src/config/preferencesdialog.c
gnome/src/dbus/dbus.c
gnome/tests/Makefile.am
2012-03-21 14:30:09 -04:00
ae6da5767c
* #9381 : use autoconf macros and AC_SEARCH_LIBS
2012-03-20 14:30:18 -04:00
91619132d8
* #6999 : Merge remote-tracking branch 'origin/master' into video_preview
...
Conflicts:
.gitignore
daemon/src/audio/audiortp/AudioRtpFactory.cpp
daemon/src/iax/iaxvoiplink.h
daemon/src/managerimpl.h
daemon/src/sip/sdp.cpp
daemon/src/sip/sdp.h
daemon/src/sip/sdpmedia.cpp
daemon/src/sip/sdpmedia.h
daemon/src/sip/sipcall.cpp
daemon/src/sip/sipcall.h
daemon/src/sip/sipvoiplink.cpp
gnome/configure.ac
gnome/src/Makefile.am
gnome/src/config/Makefile.am
gnome/tests/Makefile.am
2011-09-20 17:42:04 -04:00
39764571bf
* #6991 : fix IAX problems
2011-09-20 15:13:49 -04:00
e16a78c109
Merge branch 'master' into video_preview
...
Resolved Conflicts:
.gitignore
daemon/doc/doxygen/Makefile.am
daemon/src/account.cpp
daemon/src/account.h
daemon/src/sip/sipaccount.cpp
gnome/src/codeclist.c
gnome/src/config/Makefile.am
2011-08-22 17:29:14 -04:00
79242d9ff8
git: #6698 split the main .gitignore file
2011-08-19 19:36:10 -04:00
b68ed6803c
Merge remote-tracking branch 'origin/master' into video_preview
...
Conflicts:
daemon/src/audio/codecs/audiocodecfactory.cpp
daemon/src/history/historyitem.cpp
daemon/src/managerimpl.cpp
daemon/src/sip/sdpmedia.cpp
gnome/src/callable_obj.c
Also fix bugs in codec list
2011-08-16 09:40:51 -04:00
2ba41e9fad
updated gitignore
2011-08-15 17:36:20 -04:00
20b697bd0c
Merge branch 'master' into video_preview
...
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
2011-08-15 11:33:47 -04:00
4a9a2f4f4c
update .gitignore
2011-08-15 09:42:14 -04:00
f471d083f7
update gitignore files
2011-06-30 14:33:39 -04:00
250661822e
updated gitignore
2011-06-12 22:04:20 -04:00
d2598d6880
#6063 : Update .gitignore file
2011-06-08 16:54:36 -04:00
c9a5d09432
im
...
Signed-off-by: Jonas Fonseca <jonas.fonseca@savoirfairelinux.com >
2010-07-07 09:31:24 -04:00
0faf8c72b4
[ #3376 ] Removed sflphone-common/ from .gitignore
2010-06-11 13:19:40 -04:00
b67c6283ce
The gitignore was blocking some essential ressource
2010-05-07 14:42:24 -04:00
25ac1f0d91
add another file to ignore related to the kde project
2010-01-29 13:09:56 -05:00
4edbcb2540
Merge commit 'origin/master' into qt-client
2010-01-27 16:58:28 -05:00
1871622a2e
fix ignore for kde
2010-01-27 16:58:20 -05:00
25d843a8d7
[ #2701 ] Cleaning a little bit and implement the systray as custom class
2010-01-27 16:28:12 -05:00
e31877b30f
[ #2445 ] Updated package
2009-12-15 17:45:33 -05:00
dac85d47ad
Add /sflphone-client-gnome/src/icons/Makefile to .gitignore
2009-10-30 10:27:44 -04:00
52d86aafeb
[ #2181 ] Updated
2009-10-20 10:52:37 -04:00
b1e8529617
[ #2297 ] Update .gitignore
2009-10-14 11:58:45 -04:00
dc5ab9fec7
[ #2181 ] Added spec files for OSC
2009-10-07 10:41:18 -04:00
29558088d5
[ #1976 ] Integrate user doc to gnome client build system
2009-09-03 13:09:57 -04:00
dfd6c57950
Ignoring Makefile in src/widget
2009-08-11 14:41:46 -04:00
21ed9b55a1
[ #1797 ] Update .gitignore with new pjsip version
2009-07-06 17:01:34 -04:00
d158406415
[ #1549 ] put introspec XMLs in the client's source
2009-05-29 17:00:12 -04:00
6b93c568a8
Merge branch 'master' into qt-client
...
Conflicts:
src/dbus/configurationmanager-glue.h
2009-04-28 17:25:48 -04:00
214804f756
[ #1212 ] Add descriptive files, remove unuseful scripts from tools/
2009-04-21 22:08:38 -04:00
6e5a44627e
[ #1212 ] Update .gitignore
2009-04-21 18:21:19 -04:00
cb62648f31
[ #1212 ] New working directory functional
2009-04-21 18:18:56 -04:00
ebcc8b2722
[ #1212 ] Update .gitignore to fit the new working tree
2009-04-21 14:29:57 -04:00
de51620177
Merge branch 'master' into qt-client
...
Conflicts:
src/dbus/configurationmanager-glue.h
src/dbus/configurationmanager.cpp
src/managerimpl.cpp
2009-04-20 14:54:21 -04:00
932f2fde5c
Updated gitignore
2009-04-17 16:54:15 -04:00
