Commit Graph

3 Commits (e3aa34ec5f5682add4d72df1d9ba4c26df1b9769)

Author SHA1 Message Date
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