Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of git.linphone.org:linphone-android into bellesip

Browse source 
Conflicts:
	submodules/linphone
This commit is contained in:
Yann Diorcet 2013-02-25 09:29:09 +01:00
commit 5d4b70f111
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jni/Android.mk
View file

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

2
submodules/linphone

@ -1 +1 @@
Subproject commit b5db1828fa4594cad1f3563606f25c738606057e
Subproject commit 1d3ba8e0b67d654b872e51db2cb5e00b8577b057

2
submodules/msilbc

@ -1 +1 @@
Subproject commit 7320dbb5294f4fc92d80e794cb805185934ea16b
Subproject commit 32a39741b64d74999134f5e6425609c4cfff5daf