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	Merge commit '728ed3077cf4e47e6e972732a3f8a1b39a96f2ed' into dev_lime	2014-09-25 17:52:30 +02:00
macos	add incoming chat wav to mac bundle	2014-03-04 23:08:11 +01:00
redhat	Update README rpm	2014-04-04 11:30:03 +02:00
wince	purge out p2pproxy	2010-01-20 15:44:30 +01:00
wp8	Add transport tests (tunnel only and tunnel + srtp)	2014-09-08 14:20:31 +02:00
Makefile.am	start implementing a macos bundle	2011-03-23 18:21:37 +01:00