Margaux Clerc 4a8ce7f061 Merge commit '728ed3077cf4e47e6e972732a3f8a1b39a96f2ed' into dev_lime ... Conflicts: build/android/Android.mk coreapi/chat.c coreapi/help/filetransfer.c tester/message_tester.c		2014-09-25 17:52:30 +02:00
..
Android.mk	Merge commit '728ed3077cf4e47e6e972732a3f8a1b39a96f2ed' into dev_lime	2014-09-25 17:52:30 +02:00
config.h	Add libupnp dependency for Android	2013-02-13 16:51:50 +01:00
liblinphone_tester.mk	Add transport tests (tunnel only and tunnel + srtp)	2014-09-08 14:20:31 +02:00