Commit Graph

5 Commits (9c81a0e1bdc367e9556a70310d077f77103a2283)

Author SHA1 Message Date
winlin d57e9c758e Docs: Migrate to ossrs.net and ossrs.io 3 years ago
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