-
- Downloads
Merge branch 'master' into multichannel
Resolved Conflicts: daemon/src/audio/audioloop.cpp daemon/src/audio/audiortp/audio_rtp_record_handler.cpp daemon/src/audio/codecs/audiocodec.h daemon/src/audio/pulseaudio/pulselayer.cpp
Showing
- .gitignore 0 additions, 1 deletion.gitignore
- NEWS 5 additions, 2 deletionsNEWS
- daemon/.cproject 0 additions, 940 deletionsdaemon/.cproject
- daemon/.gitignore 13 additions, 12 deletionsdaemon/.gitignore
- daemon/.project 0 additions, 82 deletionsdaemon/.project
- daemon/autogen.sh 7 additions, 0 deletionsdaemon/autogen.sh
- daemon/configure.ac 5 additions, 4 deletionsdaemon/configure.ac
- daemon/doc/doxygen/core-doc.cfg.in 1 addition, 1 deletiondaemon/doc/doxygen/core-doc.cfg.in
- daemon/globals.mak 8 additions, 7 deletionsdaemon/globals.mak
- daemon/libs/Makefile.am 1 addition, 1 deletiondaemon/libs/Makefile.am
- daemon/libs/compile_pjsip.sh 1 addition, 1 deletiondaemon/libs/compile_pjsip.sh
- daemon/libs/pjproject-2.0.1/pjlib/src/pj/lock.c 0 additions, 197 deletionsdaemon/libs/pjproject-2.0.1/pjlib/src/pj/lock.c
- daemon/libs/pjproject-2.0.1/tests/cdash/inc_test.py 0 additions, 0 deletionsdaemon/libs/pjproject-2.0.1/tests/cdash/inc_test.py
- daemon/libs/pjproject-2.0.1/third_party/speex/libspeex/hexc_table.c 0 additions, 162 deletions...s/pjproject-2.0.1/third_party/speex/libspeex/hexc_table.c
- daemon/libs/pjproject-2.0.1/third_party/srtp/crypto/cipher/aes.c 0 additions, 1951 deletions...libs/pjproject-2.0.1/third_party/srtp/crypto/cipher/aes.c
- daemon/libs/pjproject-2.1.0/COPYING 1 addition, 0 deletionsdaemon/libs/pjproject-2.1.0/COPYING
- daemon/libs/pjproject-2.1.0/INSTALL.txt 3 additions, 2 deletionsdaemon/libs/pjproject-2.1.0/INSTALL.txt
- daemon/libs/pjproject-2.1.0/Makefile 4 additions, 4 deletionsdaemon/libs/pjproject-2.1.0/Makefile
- daemon/libs/pjproject-2.1.0/README-RTEMS 16 additions, 13 deletionsdaemon/libs/pjproject-2.1.0/README-RTEMS
- daemon/libs/pjproject-2.1.0/README.txt 1 addition, 0 deletionsdaemon/libs/pjproject-2.1.0/README.txt
Loading
Please register or sign in to comment