-
Simon Morlat authored
Conflicts: coreapi/linphonecall.c coreapi/linphonecore.c java/common/org/linphone/core/LinphoneCall.java mediastreamer2
6d0b58eb
Conflicts: coreapi/linphonecall.c coreapi/linphonecore.c java/common/org/linphone/core/LinphoneCall.java mediastreamer2