Jehan Monnier ed4d9c0d20 Merge remote-tracking branch 'origin' into dev_lime ... Conflicts: build/android/Android.mk coreapi/Makefile.am		2014-05-14 15:15:50 +02:00
..
Android.mk	Merge remote-tracking branch 'origin' into dev_lime	2014-05-14 15:15:50 +02:00
config.h	Add libupnp dependency for Android	2013-02-13 16:51:50 +01:00
liblinphone_gitversion.h	Add libupnp dependency for Android	2013-02-13 16:51:50 +01:00
liblinphone_tester.mk	Add missing tester.c file for Android compilation	2014-03-12 10:29:44 +01:00