-
- Downloads
Merge branch 'sip_dev' of ssh://yun@192.168.1.16/home-local/manu/dev/sfl/sflphone into yun-pjsip
Conflicts: configure.ac src/useragent.cpp
No related branches found
No related tags found
Showing
- configure.ac 1 addition, 1 deletionconfigure.ac
- src/account.cpp 1 addition, 1 deletionsrc/account.cpp
- src/audio/alsalayer.cpp 4 additions, 2 deletionssrc/audio/alsalayer.cpp
- src/audio/codecDescriptor.cpp 2 additions, 2 deletionssrc/audio/codecDescriptor.cpp
- src/audio/pulselayer.cpp 10 additions, 10 deletionssrc/audio/pulselayer.cpp
- src/audio/pulselayer.h 3 additions, 3 deletionssrc/audio/pulselayer.h
- src/audio/samplecache.cpp 1 addition, 1 deletionsrc/audio/samplecache.cpp
- src/dbus/callmanager.cpp 1 addition, 1 deletionsrc/dbus/callmanager.cpp
- src/dbus/configurationmanager.cpp 10 additions, 3 deletionssrc/dbus/configurationmanager.cpp
- src/dbus/contactmanager.cpp 6 additions, 4 deletionssrc/dbus/contactmanager.cpp
- src/dbus/instance.cpp 3 additions, 3 deletionssrc/dbus/instance.cpp
- src/global.h 2 additions, 0 deletionssrc/global.h
- src/managerimpl.cpp 5 additions, 5 deletionssrc/managerimpl.cpp
- src/sipvoiplink.cpp 4 additions, 4 deletionssrc/sipvoiplink.cpp
- src/useragent.cpp 2 additions, 2 deletionssrc/useragent.cpp
- src/useragent.h 2 additions, 2 deletionssrc/useragent.h
- src/voiplink.cpp 1 addition, 1 deletionsrc/voiplink.cpp
Loading
Please register or sign in to comment