Merge remote-tracking branch 'origin/master' into dev_vcard

11f07d32 · Sylvain Berfini · dc97956e · 582edcff · 11f07d32 · 1f469d08
Commit 11f07d32 authored Feb 18, 2016 by Sylvain Berfini
6 changed files
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,3 +49,6 @@
 [submodule "submodules/bctoolbox"]
 	path = submodules/bctoolbox
 	url = git://git.linphone.org/bctoolbox.git
+[submodule "submodules/externals/mbedtls"]
+	path = submodules/externals/mbedtls
+	url = git://git.linphone.org/mbedtls.git
--- a/bctoolbox @ 1f469d08
+++ b/bctoolbox @ 1f469d08
-Subproject commit 6eb484f8c1039cfcddc52cce57d21b51de857ef4
+Subproject commit 1f469d085dfd67dd05288ff7dc8af00201fab31c
--- a/belle-sip @ fa541d67
+++ b/belle-sip @ fa541d67
-Subproject commit c130b4eba162cdcc4c03838e5430867f8b418257
+Subproject commit fa541d67f415bb6379ddf99f97e32c84250ef63f
--- a/bzrtp @ de8bd747
+++ b/bzrtp @ de8bd747
-Subproject commit 19923c26888daf96584cfe6468f9c1bb4a63114b
+Subproject commit de8bd747f4dd38c32bb7ba5d0613fdfdf4b0475c
--- a/cmake-builder @ 1f209119
+++ b/cmake-builder @ 1f209119
-Subproject commit de07c524ffa37121544bae56f31db82bc24e8d58
+Subproject commit 1f2091190c8e56927d614d837eb8983aa62a241e
--- a/mbedtls @ 3b88f274
+++ b/mbedtls @ 3b88f274
+Subproject commit 3b88f2749d59e5346de08e121fba1d797c55ddaa