linphone-iphone/include
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
..
sal Merge commit '728ed3077cf4e47e6e972732a3f8a1b39a96f2ed' into dev_lime 2014-09-25 17:52:30 +02:00
Makefile.am add missing makedile file 2013-08-20 16:58:17 +02:00