Merge branch 'dev_vcard'

Conflicts: submodules/linphone

Merge branch 'dev_vcard'
Conflicts: submodules/linphone
d49ce7f9 · Sylvain Berfini · 3cb5f072 · baf9d764 · d49ce7f9 · d866f528
Commit d49ce7f9 authored Mar 03, 2016 by Sylvain Berfini
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

.gitmodules .gitmodules +6 -0

belcard submodules/belcard +1 -0

belr submodules/belr +1 -0

linphone submodules/linphone +1 -1

No files found.
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,6 +31,12 @@
 [submodule "submodules/mswebrtc"]
 	path = submodules/mswebrtc
 	url = git://git.linphone.org/mswebrtc.git
+[submodule "submodules/belcard"]
+	path = submodules/belcard
+	url = git://git.linphone.org/belcard.git
+[submodule "submodules/belr"]
+	path = submodules/belr
+	url = git://git.linphone.org/belr.git
 [submodule "submodules/externals/libmatroska-c"]
 	path = submodules/externals/libmatroska-c
 	url = git://git.linphone.org/libmatroska-c.git

--- a/belcard @ d866f528
+++ b/belcard @ d866f528
+Subproject commit d866f528bdfd06bd896eeca9713a3027b68d5e4b
--- a/belr @ f8b99563
+++ b/belr @ f8b99563
+Subproject commit f8b995635bb18af124780f3e7c4c10ce68601160
--- a/linphone @ 6654e66e
+++ b/linphone @ 6654e66e
-Subproject commit 806d1b21b688b245ec8fbce04d986221ed222173
+Subproject commit 6654e66e9240a78b9fb9386d670105dce555fb23