winlin 2a4b448cce Merge branch '2.0release' into develop		2015-08-24 11:04:48 +08:00
..
3rdparty	osx support build nginx and ffmpeg	2015-03-17 21:51:19 +08:00
auto	refine code, support configure to enable --memory-watch	2015-06-13 15:45:25 +08:00
conf	for #367, design the config for exec.	2015-08-23 21:58:06 +08:00
doc	for #328, add hds specification.	2015-03-12 11:36:12 +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	move json from app to protocol	2015-08-21 16:20:19 +08:00
modules	refine build for modules, add defines.	2015-03-23 17:49:45 +08:00
research	refine srs player, support set the bufferTimeMax.	2015-08-24 07:55:30 +08:00
scripts	fix bug of commit script	2015-08-24 11:04:39 +08:00
src	release 2.0alpha0, the 2.0a0, 2.0.185	2015-08-23 09:00:21 +08:00
configure	move json from app to protocol	2015-08-21 16:20:19 +08:00