10 commits

Author	SHA1	Message	Date
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	cf7504826b	fix reload ingest bug, remove when disabled. 0.9.196	2014-08-16 19:59:14 +08:00
winlin	7b24788445	for bug #143, build on centos5.	2014-08-02 22:18:39 +08:00
winlin	0db2e6b8e9	fix the empty config error	2014-07-20 17:08:47 +08:00
winlin	9b6c22644d	add basic utest for config directive	2014-07-20 15:27:05 +08:00
winlin	073d900674	add consts to kernel	2014-07-20 13:04:48 +08:00