mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-18 11:38:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linphone-iphone/java/impl/org/linphone
History
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
..
core Merge branch 'master' into dev_vcard 2016-01-08 10:37:54 +01:00
tools no longer manually loas lib xml on Android 2013-04-10 17:35:51 +02:00