Guillaume BIENKOWSKI dec0ccb9df Merge remote-tracking branch 'public/master' into dev_lime ... Conflicts: build/android/Android.mk coreapi/private.h		2014-10-31 10:47:13 +01:00
..
Android.mk	Merge remote-tracking branch 'public/master' into dev_lime	2014-10-31 10:47:13 +01:00
config.h	Add libupnp dependency for Android	2013-02-13 16:51:50 +01:00
liblinphone_tester.mk	Add the LinphonePlayer Java interface	2014-10-06 15:07:47 +02:00