-
Sylvain Berfini authored
Conflicts: coreapi/CMakeLists.txt coreapi/Makefile.am coreapi/linphonecore.h java/common/org/linphone/core/LinphoneCore.java java/impl/org/linphone/core/LinphoneCoreImpl.java
3b7c61e6
Conflicts: coreapi/CMakeLists.txt coreapi/Makefile.am coreapi/linphonecore.h java/common/org/linphone/core/LinphoneCore.java java/impl/org/linphone/core/LinphoneCoreImpl.java