linphone-iphone/include/sal
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
..
sal.h Merge remote-tracking branch 'origin/master' into dev_lime 2014-06-30 20:26:21 +02:00