-
- Downloads
Merge branch 'master' of...
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/dbus/callmanager.h daemon/src/iax/iaxaccount.cpp daemon/src/sip/sdp.cpp daemon/src/sip/sipaccount.cpp daemon/src/sip/sipcall.cpp daemon/src/sip/sipvoiplink.cpp gnome/src/actions.c gnome/src/codeclist.c gnome/src/config/audioconf.c gnome/src/contacts/calltree.c kde/plasma/plasmoid-qml/package/contents/ui/BookmarkTab.qml kde/plasma/plasmoid-qml/package/contents/ui/CallTab.qml kde/plasma/plasmoid-qml/package/contents/ui/ContactTab.qml kde/plasma/plasmoid-qml/package/contents/ui/DialPad.qml kde/plasma/plasmoid-qml/package/contents/ui/HistoryTab.qml kde/plasma/plasmoid-qml/package/contents/ui/NumberOverlay.qml kde/plasma/plasmoid-qml/package/contents/ui/Settingstab.qml kde/plasma/plasmoid-qml/package/contents/ui/TransferOverlay.qml kde/plasma/plasmoid-qml/package/contents/ui/main.qml kde/plasma/plasmoid-qml/package/metadata.desktop kde/src/AccountListModel.cpp kde/src/AccountWizard.cpp kde/src/CallView.cpp kde/src/SFLPhoneView.cpp kde/src/conf/dlgaddressbook.cpp kde/src/conf/dlgaudio.cpp kde/src/conf/dlggeneral.cpp kde/src/klib/AkonadiBackend.cpp kde/src/klib/AkonadiBackend.h kde/src/klib/CMakeLists.txt kde/src/klib/ConfigurationSkeleton.cpp kde/src/klib/HelperFunctions.cpp kde/src/klib/SortableDockCommon.h kde/src/klib/SortableDockCommon.hpp kde/src/klib/dataengine/CMakeLists.txt kde/src/klib/dataengine/sflphonEngine.cpp kde/src/klib/dataengine/sflphonEngine.h kde/src/klib/dataengine/sflphone.operations kde/src/klib/dataengine/sflphoneService.cpp kde/src/klib/dataengine/sflphoneService.h kde/src/klib/sflphone-client-kde.kcfg kde/src/lib/AccountList.cpp kde/src/lib/CallModel.cpp kde/src/lib/CallModel.h kde/src/lib/CallModel.hpp kde/src/lib/sflphone_const.h kde/src/widgets/BookmarkDock.cpp kde/src/widgets/BookmarkDock.h kde/src/widgets/CategorizedTreeWidget.cpp kde/src/widgets/CategoryDrawer.h kde/src/widgets/ContactDock.cpp kde/src/widgets/HistoryDock.cpp kde/src/widgets/HistoryTreeItem.cpp tools/build-system/launchpad/sflphone-client-kde/debian/rules
No related branches found
No related tags found
Showing
- daemon/libs/iax2/iax-client.h 1 addition, 0 deletionsdaemon/libs/iax2/iax-client.h
- daemon/src/account.cpp 4 additions, 1 deletiondaemon/src/account.cpp
- daemon/src/audio/codecs/audiocodecfactory.cpp 9 additions, 8 deletionsdaemon/src/audio/codecs/audiocodecfactory.cpp
- daemon/src/dbus/callmanager.cpp 2 additions, 2 deletionsdaemon/src/dbus/callmanager.cpp
- daemon/src/fileutils.cpp 1 addition, 0 deletionsdaemon/src/fileutils.cpp
- daemon/src/sip/sdp.cpp 2 additions, 2 deletionsdaemon/src/sip/sdp.cpp
- daemon/src/sip/sipaccount.cpp 11 additions, 2 deletionsdaemon/src/sip/sipaccount.cpp
- daemon/src/sip/sipvoiplink.cpp 263 additions, 175 deletionsdaemon/src/sip/sipvoiplink.cpp
- gnome/po/Makefile.am 1 addition, 0 deletionsgnome/po/Makefile.am
- gnome/po/ab.po 11 additions, 71 deletionsgnome/po/ab.po
- gnome/po/update_translation.sh 74 additions, 0 deletionsgnome/po/update_translation.sh
- gnome/src/actions.c 3 additions, 3 deletionsgnome/src/actions.c
- gnome/src/codeclist.c 92 additions, 32 deletionsgnome/src/codeclist.c
- gnome/src/codeclist.h 6 additions, 18 deletionsgnome/src/codeclist.h
- gnome/src/config/accountconfigdialog.c 6 additions, 6 deletionsgnome/src/config/accountconfigdialog.c
- gnome/src/config/audioconf.c 25 additions, 18 deletionsgnome/src/config/audioconf.c
- gnome/src/config/videoconf.c 20 additions, 18 deletionsgnome/src/config/videoconf.c
- gnome/src/contacts/calltree.c 0 additions, 6 deletionsgnome/src/contacts/calltree.c
- gnome/src/dbus/dbus.c 0 additions, 2 deletionsgnome/src/dbus/dbus.c
- hudson-sflphone-script.sh 30 additions, 2 deletionshudson-sflphone-script.sh
Loading
Please register or sign in to comment