-
- Downloads
Merge branch 'master' into presence_sip_dev
Conflicts: daemon/src/managerimpl.cpp daemon/src/sip/sipaccount.h
Showing
- .gitignore 8 additions, 0 deletions.gitignore
- astylerc 1 addition, 0 deletionsastylerc
- daemon/.cproject 0 additions, 940 deletionsdaemon/.cproject
- daemon/.gitignore 2 additions, 1 deletiondaemon/.gitignore
- daemon/.project 0 additions, 82 deletionsdaemon/.project
- daemon/configure-android.sh 1 addition, 0 deletionsdaemon/configure-android.sh
- daemon/configure.ac 44 additions, 27 deletionsdaemon/configure.ac
- daemon/globals.mak 9 additions, 2 deletionsdaemon/globals.mak
- daemon/libs/iax2/iax.c 9 additions, 9 deletionsdaemon/libs/iax2/iax.c
- daemon/libs/iax2/iax2-parser.c 2 additions, 2 deletionsdaemon/libs/iax2/iax2-parser.c
- daemon/libs/iax2/jitterbuf.c 8 additions, 16 deletionsdaemon/libs/iax2/jitterbuf.c
- daemon/libs/iax2/md5.c 5 additions, 5 deletionsdaemon/libs/iax2/md5.c
- daemon/libs/iax2/md5.h 4 additions, 1 deletiondaemon/libs/iax2/md5.h
- daemon/m4/ax_cxx_compile_stdcxx_11.m4 133 additions, 0 deletionsdaemon/m4/ax_cxx_compile_stdcxx_11.m4
- daemon/src/Makefile.am 5 additions, 4 deletionsdaemon/src/Makefile.am
- daemon/src/account.cpp 13 additions, 12 deletionsdaemon/src/account.cpp
- daemon/src/account.h 2 additions, 0 deletionsdaemon/src/account.h
- daemon/src/audio/Makefile.am 11 additions, 2 deletionsdaemon/src/audio/Makefile.am
- daemon/src/audio/alsa/Makefile.am 3 additions, 0 deletionsdaemon/src/audio/alsa/Makefile.am
- daemon/src/audio/alsa/alsalayer.cpp 86 additions, 82 deletionsdaemon/src/audio/alsa/alsalayer.cpp
Loading
Please register or sign in to comment