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

Merge branch '2.0release' into develop

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

View file

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