胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
a865eb9c 2 parents a7c4b786 1d477ae7

merge from srs2

内嵌 并排对比
正在显示 1 个修改的文件 包含 4 行增加 和 2 行删除
@@ -316,6 +316,7 @@ Remark: @@ -316,6 +316,7 @@ Remark:
316 316
317 ## Releases 317 ## Releases
318 318
  319 +* 2015-09-14, [Release v2.0a1][r2.0a1], 2.0 alpha1, 2.0.189, 89269 lines.<br/>
319 * 2015-08-23, [Release v2.0a0][r2.0a0], 2.0 alpha0, 2.0.185, 89022 lines.<br/> 320 * 2015-08-23, [Release v2.0a0][r2.0a0], 2.0 alpha0, 2.0.185, 89022 lines.<br/>
320 * 2015-05-23, [Release v1.0r4][r1.0r4], bug fixed, 1.0.32, 59509 lines.<br/> 321 * 2015-05-23, [Release v1.0r4][r1.0r4], bug fixed, 1.0.32, 59509 lines.<br/>
321 * 2015-03-19, [Release v1.0r3][r1.0r3], bug fixed, 1.0.30, 59511 lines.<br/> 322 * 2015-03-19, [Release v1.0r3][r1.0r3], bug fixed, 1.0.30, 59511 lines.<br/>
@@ -1207,6 +1208,7 @@ Winlin @@ -1207,6 +1208,7 @@ Winlin
1207 [bug #367]: https://github.com/simple-rtmp-server/srs/issues/367 1208 [bug #367]: https://github.com/simple-rtmp-server/srs/issues/367
1208 [bug #319]: https://github.com/simple-rtmp-server/srs/issues/319 1209 [bug #319]: https://github.com/simple-rtmp-server/srs/issues/319
1209 1210
  1211 +[r2.0a1]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a1
1210 [r2.0a0]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a0 1212 [r2.0a0]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a0
1211 [r1.0r4]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r4 1213 [r1.0r4]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r4
1212 [r1.0r3]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r3 1214 [r1.0r3]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r3
@@ -1240,8 +1242,8 @@ Winlin @@ -1240,8 +1242,8 @@ Winlin
1240 [branch2]: https://github.com/simple-rtmp-server/srs/tree/2.0release 1242 [branch2]: https://github.com/simple-rtmp-server/srs/tree/2.0release
1241 [release2]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release20 1243 [release2]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release20
1242 [release3]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release30 1244 [release3]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release30
1243 -[centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.185.zip  
1244 -[centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.185.zip 1245 +[centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.189.zip
  1246 +[centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.189.zip
1245 1247
1246 [srs2_CN]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Home 1248 [srs2_CN]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Home
1247 [srs2_EN]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Home 1249 [srs2_EN]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Home