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

This commit is contained in:
Sylvain Berfini 2016-02-18 17:21:39 +01:00
commit 11f07d3281
6 changed files with 8 additions and 4 deletions

3
.gitmodules vendored
View file

@ -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

@ -1 +1 @@
Subproject commit 6eb484f8c1039cfcddc52cce57d21b51de857ef4
Subproject commit 1f469d085dfd67dd05288ff7dc8af00201fab31c

@ -1 +1 @@
Subproject commit c130b4eba162cdcc4c03838e5430867f8b418257
Subproject commit fa541d67f415bb6379ddf99f97e32c84250ef63f

@ -1 +1 @@
Subproject commit 19923c26888daf96584cfe6468f9c1bb4a63114b
Subproject commit de8bd747f4dd38c32bb7ba5d0613fdfdf4b0475c

@ -1 +1 @@
Subproject commit de07c524ffa37121544bae56f31db82bc24e8d58
Subproject commit 1f2091190c8e56927d614d837eb8983aa62a241e

1
submodules/externals/mbedtls vendored Submodule

@ -0,0 +1 @@
Subproject commit 3b88f2749d59e5346de08e121fba1d797c55ddaa