mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-29 17:29:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev_bzrtp'

Browse source 
Conflicts:
	oRTP
This commit is contained in:
Jehan Monnier 2014-04-01 16:21:17 +02:00
commit e0d25ce29e
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/android/Android.mk
View file

@ -201,7 +201,7 @@ LOCAL_CFLAGS += $(LIBLINPHONE_EXTENDED_CFLAGS)
ifeq ($(BUILD_GPLV3_ZRTP),1)
LOCAL_SHARED_LIBRARIES += libssl-linphone libcrypto-linphone
LOCAL_SHARED_LIBRARIES += libzrtpcpp
LOCAL_SHARED_LIBRARIES += libbzrtp
endif
ifeq ($(BUILD_SRTP),1)

2
mediastreamer2

@ -1 +1 @@
Subproject commit 17471b98625bc6096427351ba78f290740d15265
Subproject commit fa22310955303f6a2185fec8c5610aa6f24b46fb

2
oRTP

@ -1 +1 @@
Subproject commit c0418933b7ce4765993b7304809e43df6ed392dd
Subproject commit dc4197cfceb4074018a0b7ad22a3c24fa454c129