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	Merge remote-tracking branch 'origin/master' into dev_lime	2014-06-30 20:26:21 +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	webrtcisac has been renamed to webrtc.	2014-06-27 17:57:52 +02:00
Makefile.am	start implementing a macos bundle	2011-03-23 18:21:37 +01:00