-
Sylvain Berfini authored
Conflicts: build/android/Android.mk coreapi/CMakeLists.txt coreapi/Makefile.am coreapi/friend.c coreapi/linphonecore.c coreapi/linphonecore.h
44e18649
Conflicts: build/android/Android.mk coreapi/CMakeLists.txt coreapi/Makefile.am coreapi/friend.c coreapi/linphonecore.c coreapi/linphonecore.h