winlin f6c8e02cca Merge branch '2.0release' into develop		2016-11-24 18:12:31 +08:00
..
3rdparty	osx support build nginx and ffmpeg	2015-03-17 21:51:19 +08:00
auto	Merge branch '2.0release' into develop	2016-03-03 15:30:38 +08:00
conf	merge srs2, support oryx	2016-09-23 15:33:43 +08:00
doc	rename kafka protocol	2015-09-16 13:56:52 +08:00
etc/init.d	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
ide	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
modules	show signature of server.	2016-01-04 17:28:18 +08:00
research	merge srs2	2016-09-27 11:00:13 +08:00
scripts	Merge branch '2.0release' into develop	2016-09-13 15:53:40 +08:00
src	Merge branch '2.0release' into develop	2016-11-24 18:12:31 +08:00
configure	Merge branch '2.0release' into develop	2016-09-15 13:31:28 +08:00