winlin 6b8fe92afa Merge branch '2.0release' into develop		2016-09-13 15:53:40 +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	refine config	2016-08-09 12:37:48 +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 branch '2.0release' into develop	2016-09-09 14:57:58 +08:00
scripts	Merge branch '2.0release' into develop	2016-09-13 15:53:40 +08:00
src	merge srs2.	2016-09-12 18:21:44 +08:00
configure	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00