From aba520dc5d8c4570dbae7233cd64b36b82c8b226 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 22 Feb 2013 21:29:06 +0100 Subject: [PATCH 1/2] update linphone submodule for new conference recording api. --- jni/Android.mk | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index fe46137de..11ed3ae2d 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -76,7 +76,7 @@ endif include $(linphone-root-dir)/submodules/linphone/oRTP/build/android/Android.mk include $(linphone-root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk -include $(linphone-root-dir)/submodules/linphone/mediastreamer2/tests/Android.mk +include $(linphone-root-dir)/submodules/linphone/mediastreamer2/tools/Android.mk ifeq ($(BUILD_TUNNEL), 1) diff --git a/submodules/linphone b/submodules/linphone index 1136049cf..0b9b574db 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 1136049cf0ebd3246bb9152df7168ad90072e250 +Subproject commit 0b9b574db7fc4fe06b028a6d79ffdb902826dc04 From 33b8ba4f66a2839784fcaf9b3342662f73e910df Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 22 Feb 2013 21:31:56 +0100 Subject: [PATCH 2/2] update msilbc submodule, for PLC implementation. --- submodules/msilbc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/msilbc b/submodules/msilbc index 7320dbb52..32a39741b 160000 --- a/submodules/msilbc +++ b/submodules/msilbc @@ -1 +1 @@ -Subproject commit 7320dbb5294f4fc92d80e794cb805185934ea16b +Subproject commit 32a39741b64d74999134f5e6425609c4cfff5daf