Jehan Monnier 5035992c64 Merge remote-tracking branch 'private/dev_lime' ... Conflicts: coreapi/linphonecall.c		2015-03-12 15:08:35 +01:00
..
Android.mk	Merge remote-tracking branch 'private/dev_lime'	2015-03-12 15:08:35 +01:00
config.h	Add libupnp dependency for Android	2013-02-13 16:51:50 +01:00
liblinphone_tester.mk	fix tester Android.mk	2015-03-04 21:36:08 +01:00