Guillaume Beraudo b07b784570 Conferencing JNI + Android support. ... Conflicts: coreapi/conference.c coreapi/linphonecore.h		2011-09-14 10:27:11 +02:00
..
Android.mk	Conferencing JNI + Android support.	2011-09-14 10:27:11 +02:00