胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
2a88a7c9 2 parents a56013b4 0c4739b2

Merge branch '1.0release'

内嵌 并排对比
正在显示 2 个修改的文件 包含 4 行增加 和 9 行删除
1 There are three types of people that have contributed to the SRS project: 1 There are three types of people that have contributed to the SRS project:
2 -1. PRIMARY: Contribute important features and >10% code. Names of all PRIMARY response in NetConnection.connect and metadata.  
3 -2. AUTHORS: Contribute features and 1%~10% code. Names of all PRIMARY response in NetConnection.connect and metadata.  
4 -3. CONTRIBUTORS: Submit patches, report bugs, add translations, help answer newbie questions, and generally make SRS that much better.  
5 -  
6 -PRIMARY ordered by first contribution.  
7 -* winlin<winlin@vip.126.com> "Plan, arch, implement SRS1.0 and SRS2.0" 2 +1. AUTHORS: Contribute important features. Names of all PRIMARY response in NetConnection.connect and metadata.
  3 +2. CONTRIBUTORS: Submit patches, report bugs, add translations, help answer newbie questions, and generally make SRS that much better.
8 4
9 AUTHORS ordered by first contribution. 5 AUTHORS ordered by first contribution.
  6 +* winlin<winlin@vip.126.com> "Plan, arch, implement SRS1.0"
10 * wenjie.zhao<740936897@qq.com> "The bandwidth test module" 7 * wenjie.zhao<740936897@qq.com> "The bandwidth test module"
11 8
12 CONTRIBUTORS ordered by first contribution. 9 CONTRIBUTORS ordered by first contribution.
@@ -166,9 +166,7 @@ StreamServers：[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https @@ -166,9 +166,7 @@ StreamServers：[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https
166 ## AUTHORS 166 ## AUTHORS
167 167
168 There are three types of people that have contributed to the SRS project: 168 There are three types of people that have contributed to the SRS project:
169 -* PRIMARY: Contribute important features and >10% code. Names of all  
170 -PRIMARY response in NetConnection.connect and metadata.  
171 -* AUTHORS: Contribute features and 1%~10% code. Names of all 169 +* AUTHORS: Contribute important features. Names of all
172 PRIMARY response in NetConnection.connect and metadata. 170 PRIMARY response in NetConnection.connect and metadata.
173 * CONTRIBUTORS: Submit patches, report bugs, add translations, help answer 171 * CONTRIBUTORS: Submit patches, report bugs, add translations, help answer
174 newbie questions, and generally make SRS that much better. 172 newbie questions, and generally make SRS that much better.