Sylvain Berfini 44e18649ac Merge branch 'master' into dev_vcard ... Conflicts: build/android/Android.mk coreapi/CMakeLists.txt coreapi/Makefile.am coreapi/friend.c coreapi/linphonecore.c coreapi/linphonecore.h		2016-01-08 10:37:54 +01:00
..
bc_completion	tester: fix autocompletion and minor tests changes	2015-07-07 11:28:09 +02:00
bc_tester_utils.c	Fix malloc/free mismatches in tester.	2016-01-06 12:00:12 +01:00
bc_tester_utils.h	Fix malloc/free mismatches in tester.	2016-01-06 12:00:12 +01:00
thousand_vcards.vcf	Improve import friends from vcard time by bypassing a few checks + added test to calculate 1000 vcards import time	2015-12-17 14:24:22 +01:00
vcards.vcf	Added import friends from vcards test	2015-12-16 11:54:34 +01:00