Jehan Monnier 819ca3bb78 Merge remote-tracking branch 'origin/master' into dev_lime ... Conflicts: coreapi/chat.c coreapi/help/filetransfer.c tester/message_tester.c		2014-06-30 20:26:21 +02:00
..
Android.mk	Merge remote-tracking branch 'origin/master' into dev_lime	2014-06-30 20:26:21 +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	Quality reporting: separate unit tests in a different file and fix mid term session report	2014-06-10 15:50:41 +02:00