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

diff --cc coreapi/linphonecore.c
Simple merge

diff --cc coreapi/linphonecore.h
index f4bb368c61240e1c40ed9ee7b10e1e69fa41ffe8,245bd899b18367965c1955d910bf1ebba337270c..8b747659e2929203c6a284f4250772e2f72204ac
--- 1/coreapi/linphonecore.h
--- 2/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@@ -1037,28 -1031,10 +1037,30 @@@ int linphone_core_terminate_conference(
  int linphone_core_get_conference_size(LinphoneCore *lc);
  
  int linphone_core_get_max_calls(LinphoneCore *lc);
+ void linphone_core_set_max_calls(LinphoneCore *lc, int max);
+ 
  bool_t linphone_core_sound_resources_locked(LinphoneCore *lc);
  
 +bool_t linphone_core_media_encryption_supported(const LinphoneCore *lc, LinphoneMediaEncryption menc);
 +
 +/**
 + * Choose media encryption policy to be used for RTP packets
 + */
 +void linphone_core_set_media_encryption(LinphoneCore *lc, enum LinphoneMediaEncryption menc);
 +enum LinphoneMediaEncryption linphone_core_get_media_encryption(LinphoneCore *lc);
 +
 +bool_t linphone_core_is_media_encryption_mandatory(LinphoneCore *lc);
 +/**
 + * Defines Linphone behaviour when encryption parameters negociation fails on outoing call.
 + * If set to TRUE call will fail; if set to FALSE will resend an INVITE with encryption disabled
 + */
 +void linphone_core_set_media_encryption_mandatory(LinphoneCore *lc, bool_t m);
 +
 +/**
 + * Init call params using LinphoneCore's current configuration
 + */
 +void linphone_core_init_default_params(LinphoneCore*lc, LinphoneCallParams *params);
 +
  #ifdef __cplusplus
  }
  #endif

diff --cc coreapi/linphonecore_jni.cc
Simple merge

diff --cc java/common/org/linphone/core/LinphoneCore.java
Simple merge