4 Commits

Author	SHA1	Message	Date
winlin	15570d93ce	change conf to console without daemon.	2017-02-09 14:17:36 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
wenjie.zhao	e57bda8908	Merge code. ... Conflicts: trunk/configure trunk/src/app/srs_app_source.cpp trunk/src/kernel/srs_kernel_error.hpp	2015-03-11 14:18:09 +08:00