github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,624 Commits
14 Branches
107 Tags
345 MiB
Commit Graph

4 Commits (6d64490d738ff6b8f51f80dce80bb1297bec9416)

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