Merge branch 'master' of git.linphone.org:linphone-desktop

2a3366ae · Sandrine Avakian · b2b5940c · 6d0b6ff0 · 29ed124f · 612e63f6
Commit 2a3366ae authored Feb 08, 2017 by Sandrine Avakian
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

cmake-builder submodules/cmake-builder +1 -1

linphone submodules/linphone +1 -1

No files found.
--- a/cmake-builder @ 29ed124f
+++ b/cmake-builder @ 29ed124f
-Subproject commit 47730043d657d79878870995e2b15890a320e73b
+Subproject commit 29ed124fdda3dbdc1a9bdaecd93949b460261a85
--- a/linphone @ 612e63f6
+++ b/linphone @ 612e63f6
-Subproject commit 9949784c2d3d01f2d9885b2198dcfc3c13a05304
+Subproject commit 612e63f6840e7f0a38c1040a0fd72b880bd39c81