winlin 8862ec1988 merge from srs2		2015-10-01 13:05:25 +08:00
..
3rdparty	osx support build nginx and ffmpeg	2015-03-17 21:51:19 +08:00
auto	merge from srs2	2015-10-01 13:05:25 +08:00
conf	add brokers to config	2015-09-24 14:53:22 +08:00
doc	rename kafka protocol	2015-09-16 13:56:52 +08:00
etc/init.d	for #374, use fast stop for ingesters to stop many FFMPEG.	2015-05-30 11:25:33 +08:00
ide	add load balance round robin for brokers.	2015-09-24 17:20:04 +08:00
modules	refine build for modules, add defines.	2015-03-23 17:49:45 +08:00
research	Merge branch '2.0release' into develop	2015-09-23 18:23:17 +08:00
scripts	add --x86-64 alias for --x86-x64.	2015-09-22 13:52:14 +08:00
src	merge from srs2	2015-10-01 13:05:25 +08:00
configure	add load balance round robin for brokers.	2015-09-24 17:20:04 +08:00