external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-04-29 17:28:23 +08:00
commit 9189a408c1
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
AUTHORS.txt
View file

@ -1,12 +1,9 @@
There are three types of people that have contributed to the SRS project: There are three types of people that have contributed to the SRS project:
1. PRIMARY: Contribute important features and >10% code. Names of all PRIMARY response in NetConnection.connect and metadata. 1. AUTHORS: Contribute important features. Names of all PRIMARY response in NetConnection.connect and metadata.
2. AUTHORS: Contribute features and 1%~10% code. Names of all PRIMARY response in NetConnection.connect and metadata. 2. CONTRIBUTORS: Submit patches, report bugs, add translations, help answer newbie questions, and generally make SRS that much better.
3. CONTRIBUTORS: Submit patches, report bugs, add translations, help answer newbie questions, and generally make SRS that much better.
PRIMARY authors ordered by first contribution.
* winlin<winlin@vip.126.com> "Plan, arch, implement SRS1.0 and SRS2.0"
AUTHORS ordered by first contribution. AUTHORS ordered by first contribution.
* winlin<winlin@vip.126.com> "Plan, arch, implement SRS1.0 and SRS2.0"
* wenjie.zhao<740936897@qq.com> "The bandwidth test module, HDS and bug fixed." * wenjie.zhao<740936897@qq.com> "The bandwidth test module, HDS and bug fixed."
CONTRIBUTORS ordered by first contribution. CONTRIBUTORS ordered by first contribution.

4
README.md
View file

@ -187,9 +187,7 @@ StreamServers：[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https
## AUTHORS ## AUTHORS
There are three types of people that have contributed to the SRS project: There are three types of people that have contributed to the SRS project:
* PRIMARY: Contribute important features and >10% code. Names of all * AUTHORS: Contribute important features. Names of all
PRIMARY response in NetConnection.connect and metadata.
* AUTHORS: Contribute features and 1%~10% code. Names of all
PRIMARY response in NetConnection.connect and metadata. PRIMARY response in NetConnection.connect and metadata.
* CONTRIBUTORS: Submit patches, report bugs, add translations, help answer * CONTRIBUTORS: Submit patches, report bugs, add translations, help answer
newbie questions, and generally make SRS that much better. newbie questions, and generally make SRS that much better.