mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-17 11:08:06 +00:00
Merge branch 'master' of git.linphone.org:linphone-iphone
This commit is contained in:
commit
7c98f21345
2 changed files with 2 additions and 1 deletions
1
README
1
README
|
|
@ -45,4 +45,5 @@ As Skype requires that you accept its license, the plugin is not compiled and en
|
|||
ZRTP
|
||||
liblinphone-sdk depends on the GNU LIBZRTPCPP extension for ZRTP support.
|
||||
As the license of this library is GPLv3+ it is not enabled unless the enable_zrtp=yes option is passed to the make command.
|
||||
Add liblinphone-sdk/lib/libzrtpcpp.a to XCode. Define sip property media_encryption to "zrtp" in linphonerc.
|
||||
Note that activiting ZRTP makes the license of the whole application GPLv3+.
|
||||
|
|
|
|||
2
submodules/externals/srtp
vendored
2
submodules/externals/srtp
vendored
|
|
@ -1 +1 @@
|
|||
Subproject commit f21cc24184a285d0b7fec42dba7851a66f7a94ae
|
||||
Subproject commit daa25fdbacb75e2aa99f5fce1bd5836dc616fb42
|
||||
Loading…
Add table
Reference in a new issue