mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev_vcard'

Browse source 
Conflicts:
	submodules/linphone
This commit is contained in:
Sylvain Berfini 2016-03-03 13:35:51 +01:00
commit d49ce7f901
4 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

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

1
submodules/belcard Submodule

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

1
submodules/belr Submodule

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

2
submodules/linphone

@ -1 +1 @@
Subproject commit 806d1b21b688b245ec8fbce04d986221ed222173
Subproject commit 6654e66e9240a78b9fb9386d670105dce555fb23