Merge branch 'master' into dev_group_chat

This commit is contained in:
Sylvain Berfini 2018-02-01 16:59:20 +01:00
commit ca815247ef
2 changed files with 0 additions and 5 deletions

4
.gitmodules vendored
View file

@ -44,10 +44,6 @@
[submodule "submodules/belle-sip"] [submodule "submodules/belle-sip"]
path = submodules/belle-sip path = submodules/belle-sip
url = git://git.linphone.org/belle-sip.git url = git://git.linphone.org/belle-sip.git
[submodule "submodules/externals/antlr3"]
path = submodules/externals/antlr3
url = git://git.linphone.org/antlr3.git
ignore = dirty
[submodule "submodules/externals/libxml2"] [submodule "submodules/externals/libxml2"]
path = submodules/externals/libxml2 path = submodules/externals/libxml2
url = git://git.gnome.org/libxml2.git url = git://git.gnome.org/libxml2.git

@ -1 +0,0 @@
Subproject commit 1db66897fa0f2f4b397bb961b3e5a747c170ed40