From 85ec9bed2991b728adb61d3773588640018c4cdc Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 25 Jul 2018 17:36:22 +0200 Subject: [PATCH] update submodules from master --- .gitmodules | 5 ++++- submodules/bctoolbox | 2 +- submodules/belcard | 2 +- submodules/belle-sip | 2 +- submodules/belr | 2 +- submodules/cmake-builder | 2 +- submodules/externals/mbedtls | 2 +- submodules/externals/openh264 | 2 +- submodules/externals/zxing-cpp | 1 + submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- 11 files changed, 14 insertions(+), 10 deletions(-) create mode 160000 submodules/externals/zxing-cpp diff --git a/.gitmodules b/.gitmodules index 96cb93b04..ebd5c3ad1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -63,7 +63,7 @@ url = git://git.linphone.org/msopenh264.git [submodule "submodules/externals/openh264"] path = submodules/externals/openh264 - url = https://github.com/cisco/openh264 + url = https://gitlab.linphone.org/BC/public/external/openh264.git ignore = dirty [submodule "submodules/mscodec2"] path = submodules/mscodec2 @@ -117,3 +117,6 @@ [submodule "submodules/externals/xerces-c"] path = submodules/externals/xerces-c url = git://git.linphone.org/xerces-c +[submodule "submodules/externals/zxing-cpp"] + path = submodules/externals/zxing-cpp + url = https://gitlab.linphone.org/BC/public/external/zxing-cpp.git diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 48ac645ca..ed53ae3c9 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 48ac645caa629a65fb164882aeddab7eb13a56a9 +Subproject commit ed53ae3c9da4fb15c13454153383014b3257939a diff --git a/submodules/belcard b/submodules/belcard index b1622d7dd..ab5416d66 160000 --- a/submodules/belcard +++ b/submodules/belcard @@ -1 +1 @@ -Subproject commit b1622d7ddf1cbe6a0f929537861dfa8b45b293c4 +Subproject commit ab5416d66620f32ff6882b6e29dec63203dbca41 diff --git a/submodules/belle-sip b/submodules/belle-sip index 0ccbe50e3..11f4c9c61 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 0ccbe50e33dd96baa07c20fa36b066b7580e5a90 +Subproject commit 11f4c9c61feece2d46909ae62e91ac1bace64c2c diff --git a/submodules/belr b/submodules/belr index 8e841b047..cfad8fcc2 160000 --- a/submodules/belr +++ b/submodules/belr @@ -1 +1 @@ -Subproject commit 8e841b047641b1812a83880a90e89d702747ca5b +Subproject commit cfad8fcc28c7cdba69684c8e35846711aaa16775 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index d389b30b6..f58510c8c 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit d389b30b6c417d8bc7a79f561075a5c58871e3bc +Subproject commit f58510c8ce6cd89dadff2b29574d03b05c6efcc9 diff --git a/submodules/externals/mbedtls b/submodules/externals/mbedtls index d9385339a..83d21d543 160000 --- a/submodules/externals/mbedtls +++ b/submodules/externals/mbedtls @@ -1 +1 @@ -Subproject commit d9385339a5c2979786cfc844c0527593c14662c5 +Subproject commit 83d21d543c26a31943b2bd08c66b029f2ef742be diff --git a/submodules/externals/openh264 b/submodules/externals/openh264 index 9e75838c8..852d23c72 160000 --- a/submodules/externals/openh264 +++ b/submodules/externals/openh264 @@ -1 +1 @@ -Subproject commit 9e75838c8638c48a32b15c73c9da7b1fe942fd5f +Subproject commit 852d23c72acd537b75e4b95af93b866925d31bda diff --git a/submodules/externals/zxing-cpp b/submodules/externals/zxing-cpp new file mode 160000 index 000000000..0f267e5fb --- /dev/null +++ b/submodules/externals/zxing-cpp @@ -0,0 +1 @@ +Subproject commit 0f267e5fb66d45b32fba302bef0028dcf0dda84f diff --git a/submodules/linphone b/submodules/linphone index bfbfb3c17..852166f0a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bfbfb3c1746fdd8e15ac5587b40feec3074a711c +Subproject commit 852166f0a30613f6ea26172f00fe2446b7195c99 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index fb59965b1..52d316934 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit fb59965b16da840749d457ebac31fddbc01ce9d4 +Subproject commit 52d3169349b55b27090ecb81f88d10ebb65fa469