Merge branch 'master' into conference

cda5ca9f · Alexandre Savard · aa65f7c5 · 0f3c3692 · aa65f7c5 · aa65f7c5
Commit cda5ca9f authored 15 years ago by Alexandre Savard
--- a/sflphone-common/libs/pjproject/third_party/ilbc/hpOutput.c
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/hpOutput.c
--- a/sflphone-common/libs/pjproject/third_party/ilbc/hpOutput.h
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/hpOutput.h
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iCBConstruct.c
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/iCBConstruct.c
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iCBConstruct.h
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/iCBConstruct.h
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iCBSearch.c
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/iCBSearch.c
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iCBSearch.h
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/iCBSearch.h
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_decode.c
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_decode.c
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_decode.h
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_decode.h
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_define.h
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_define.h
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_encode.c
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_encode.c
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_encode.h
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_encode.h
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_test.c
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_test.c
--- a/sflphone-common/libs/pjproject/third_party/ilbc/lsf.c
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/lsf.c
--- a/sflphone-common/libs/pjproject/third_party/ilbc/lsf.h
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/lsf.h
--- a/sflphone-common/libs/pjproject/third_party/ilbc/packing.c
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/packing.c
--- a/sflphone-common/libs/pjproject/third_party/ilbc/packing.h
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/packing.h
--- a/sflphone-common/libs/pjproject/third_party/ilbc/syntFilter.c
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/syntFilter.c
--- a/sflphone-common/libs/pjproject/third_party/ilbc/syntFilter.h
+++ b/sflphone-common/libs/pjproject/third_party/ilbc/syntFilter.h
--- a/sflphone-common/libs/pjproject/third_party/milenage/milenage.c
+++ b/sflphone-common/libs/pjproject/third_party/milenage/milenage.c
--- a/sflphone-common/libs/pjproject/third_party/milenage/milenage.h
+++ b/sflphone-common/libs/pjproject/third_party/milenage/milenage.h