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 'master' into dev_vcard

Browse source 
Conflicts:
	.gitmodules
This commit is contained in:
Sylvain Berfini 2016-02-04 17:15:12 +01:00
commit 3bfb82b31e
11 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -43,3 +43,9 @@
[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
[submodule "submodules/bctoolbox"]
path = submodules/bctoolbox
url = git://git.linphone.org/bctoolbox.git

2
submodules/bcg729

@ -1 +1 @@
Subproject commit 91d1206d63e57a78af1d26058052e9d37f0b6f5d
Subproject commit e540e0c4d5521c5125e1de496ad1085e642df120

1
submodules/bctoolbox Submodule

@ -0,0 +1 @@
Subproject commit 963d1ed90a93546e737499d8192c859f0f6b114e

1
submodules/externals/libmatroska-c vendored Submodule

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

2
submodules/msamr

@ -1 +1 @@
Subproject commit 326e8f035d45ff96c1d0072a52c758730727852a
Subproject commit 5e180193d06e5d6b3394571ac7750b5359856c15

2
submodules/msilbc

@ -1 +1 @@
Subproject commit d8114cbce20391b1222861a9276255589c4e0bb6
Subproject commit 4d36bb77f6a7e259dc4c6f76b7aab3c65eaece96

2
submodules/msopenh264

@ -1 +1 @@
Subproject commit d2acb63cca728f1efa4c1ffaf52ee0aee55f731f
Subproject commit 709e1f6903914fa883ebcf26f51fece65e3e1ab5

2
submodules/mssilk

@ -1 +1 @@
Subproject commit 0c10e9f890f8e24b12fff430d559de02a213b032
Subproject commit e766ae43c503aa08080df9beb24a0fe81ce213bb

2
submodules/mswasapi

@ -1 +1 @@
Subproject commit cf04af5559222eac11aa4f4a1979ce4ce39cca90
Subproject commit 350f451051b7839e15c60b02830685ac3b0f9424

2
submodules/mswebrtc

@ -1 +1 @@
Subproject commit 27680f2d99e6f431d8fcc433c4120ddf48263578
Subproject commit 113e9818866ebbf75a03d4559d76ee89a6dcfd9f

2
submodules/msx264

@ -1 +1 @@
Subproject commit 0831ca99e4aed1d98c0766d14b206742030cdf6d
Subproject commit 427e20aeabcf62fbd2fdb48ab80f56833d3db790