Merge branch '3.10.x'

# Conflicts: # submodules/bctoolbox # submodules/belcard # submodules/belle-sip # submodules/cmake-builder # submodules/externals/cunit # submodules/linphone # submodules/mswasapi

Merge branch '3.10.x'
# Conflicts: # submodules/bctoolbox # submodules/belcard # submodules/belle-sip # submodules/cmake-builder # submodules/externals/cunit # submodules/linphone # submodules/mswasapi
8da64691 · Sandrine Avakian · 223127a9 · 50134792 · 23418135 · dfb6bd89
Commit 8da64691 authored Aug 26, 2016 by Sandrine Avakian
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

bcg729 submodules/bcg729 +1 -1

belr submodules/belr +1 -1

bzrtp submodules/bzrtp +1 -1

No files found.
--- a/bcg729 @ 23418135
+++ b/bcg729 @ 23418135
-Subproject commit 78386ce37e70607bb6be84f078320ed16c5f7ba0
+Subproject commit 23418135d21077bf41e71170179e4e3cb9723f8a
--- a/belr @ dfb6bd89
+++ b/belr @ dfb6bd89
-Subproject commit 9b796c59ae666ab37db83cf75cff9108d4beeb4e
+Subproject commit dfb6bd893ccd1fe738d39d210a8d24982fdef734
--- a/bzrtp @ 0d3874b5
+++ b/bzrtp @ 0d3874b5
-Subproject commit 41b5983a751f0690d7ddcba89384715ef98fb0af
+Subproject commit 0d3874b526221f8994c8b3f6d92a143db889b395