-
Simon Morlat authored
Conflicts: coreapi/linphonecore.c coreapi/linphonecore.h coreapi/sal_eXosip2.c java/common/org/linphone/core/LinphoneCore.java oRTP
263b1031
Conflicts: coreapi/linphonecore.c coreapi/linphonecore.h coreapi/sal_eXosip2.c java/common/org/linphone/core/LinphoneCore.java oRTP