Merge branch 'master' of git.linphone.org:linphone-iphone

This commit is contained in:
Gautier Pelloux-Prayer 2015-06-15 15:48:34 +02:00
commit 1d4044e9bf
2 changed files with 2 additions and 2 deletions

2
.gitmodules vendored
View file

@ -32,7 +32,7 @@
url = git://git.linphone.org/msx264.git
[submodule "submodules/externals/libvpx"]
path = submodules/externals/libvpx
url = http://git.chromium.org/webm/libvpx.git
url = https://github.com/webmproject/libvpx
ignore = dirty
[submodule "submodules/bzrtp"]
path = submodules/bzrtp

@ -1 +1 @@
Subproject commit 869938486e66225ded9d46d534a24df30a84d953
Subproject commit a312cb898815878f2833053c2e0c60d34afc9458