Commit Graph

4 Commits (ca2b68f42854ebbe12826a3b1229376e2c117c7e)

Author SHA1 Message Date
winlin 15570d93ce change conf to console without daemon. 8 years ago
winlin 1ffd5fd455 rename org simple-rtmp-server to ossrs 9 years ago
winlin 115daa3cc1 migarate from winlinvip to srs org 10 years ago
wenjie.zhao e57bda8908 Merge code.
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
10 years ago