• Sylvain Berfini's avatar
    Merge branch 'master' into dev_vcard · 3b7c61e6
    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
call_log.c 20.9 KB