external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into 3.0release

Browse source
This commit is contained in:
winlin 2017-05-29 12:17:25 +08:00
commit 5792c462b8
4 changed files with 434 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -12,6 +12,9 @@ Download from github.io: [Centos6-x86_64][centos0], [more...][more0]<br/>
Download from ossrs.net: [Centos6-x86_64][centos1], [more...][more1]<br/>
For the wiki for SRS/3.0, please read [Chinese][srs_CN] or [English][srs_EN].
Although SRS is licenced under [MIT][LICENSE], but there are some depended libraries
which are distributed using their own licenses, please read [License Mixing][LicenseMixing].
## Content
* [About](#about)
@ -1457,6 +1460,9 @@ Winlin
[more0]: http://winlinvip.github.io/srs.release/releases/
[more1]: http://www.ossrs.net/srs.release/releases/
[LICENSE]: https://github.com/ossrs/srs/blob/develop/LICENSE
[LicenseMixing]: https://github.com/ossrs/srs/wiki/LicenseMixing
[srs_CN]: https://github.com/ossrs/srs/wiki/v3_CN_Home
[srs_EN]: https://github.com/ossrs/srs/wiki/v3_EN_Home
[branch1]: https://github.com/ossrs/srs/tree/1.0release