Guillaume BIENKOWSKI e6209d9051 Merge commit '2e515642f07eb33974583587ddb2ee4669d4ff29' into dev_lime ... Conflicts: coreapi/chat.c		2014-11-27 18:01:33 +01:00
..
Android.mk	Merge commit '2e515642f07eb33974583587ddb2ee4669d4ff29' into dev_lime	2014-11-27 18:01:33 +01:00
config.h	Add libupnp dependency for Android	2013-02-13 16:51:50 +01:00
liblinphone_tester.mk	Fix log collection test suite for Android	2014-11-12 15:33:23 +01:00