胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
384de150 2 parents 714c13d8 d3139c52

merge srs2

内嵌 并排对比
正在显示 1 个修改的文件 包含 5 行增加 和 2 行删除
@@ -357,6 +357,7 @@ Remark: @@ -357,6 +357,7 @@ Remark:
357 357
358 ### Releases 358 ### Releases
359 359
  360 +* 2015-12-23, [Release v2.0a3][r2.0a3], 2.0 alpha3, 2.0.205, 89544 lines.<br/>
360 * 2015-10-08, [Release v2.0a2][r2.0a2], 2.0 alpha2, 2.0.195, 89358 lines.<br/> 361 * 2015-10-08, [Release v2.0a2][r2.0a2], 2.0 alpha2, 2.0.195, 89358 lines.<br/>
361 * 2015-09-14, [Release v2.0a1][r2.0a1], 2.0 alpha1, 2.0.189, 89269 lines.<br/> 362 * 2015-09-14, [Release v2.0a1][r2.0a1], 2.0 alpha1, 2.0.189, 89269 lines.<br/>
362 * 2015-08-23, [Release v2.0a0][r2.0a0], 2.0 alpha0, 2.0.185, 89022 lines.<br/> 363 * 2015-08-23, [Release v2.0a0][r2.0a0], 2.0 alpha0, 2.0.185, 89022 lines.<br/>
@@ -396,6 +397,7 @@ Remark: @@ -396,6 +397,7 @@ Remark:
396 * v3.0, 2015-08-31, fix [#319][bug #319], http raw api support query global and vhost. 397 * v3.0, 2015-08-31, fix [#319][bug #319], http raw api support query global and vhost.
397 * v3.0, 2015-08-28, fix [#471][bug #471], api response the width and height. 3.0.2 398 * v3.0, 2015-08-28, fix [#471][bug #471], api response the width and height. 3.0.2
398 * v3.0, 2015-08-25, fix [#367][bug #367], support nginx-rtmp exec. 3.0.1 399 * v3.0, 2015-08-25, fix [#367][bug #367], support nginx-rtmp exec. 3.0.1
  400 +* <strong>v2.0, 2015-12-23, [2.0 alpha3(2.0.205)][r2.0a3] released. 89544 lines.</strong>
399 * <strong>v2.0, 2015-10-08, [2.0 alpha2(2.0.195)][r2.0a2] released. 89358 lines.</strong> 401 * <strong>v2.0, 2015-10-08, [2.0 alpha2(2.0.195)][r2.0a2] released. 89358 lines.</strong>
400 * <strong>v2.0, 2015-09-14, [2.0 alpha1(2.0.189)][r2.0a1] released. 89269 lines.</strong> 402 * <strong>v2.0, 2015-09-14, [2.0 alpha1(2.0.189)][r2.0a1] released. 89269 lines.</strong>
401 * <strong>v2.0, 2015-08-23, [2.0 alpha0(2.0.185)][r2.0a0] released. 89022 lines.</strong> 403 * <strong>v2.0, 2015-08-23, [2.0 alpha0(2.0.185)][r2.0a0] released. 89022 lines.</strong>
@@ -1295,6 +1297,7 @@ Winlin @@ -1295,6 +1297,7 @@ Winlin
1295 1297
1296 [exo #828]: https://github.com/google/ExoPlayer/pull/828 1298 [exo #828]: https://github.com/google/ExoPlayer/pull/828
1297 1299
  1300 +[r2.0a3]: https://github.com/ossrs/srs/releases/tag/v2.0-a3
1298 [r2.0a2]: https://github.com/ossrs/srs/releases/tag/v2.0-a2 1301 [r2.0a2]: https://github.com/ossrs/srs/releases/tag/v2.0-a2
1299 [r2.0a1]: https://github.com/ossrs/srs/releases/tag/2.0a1 1302 [r2.0a1]: https://github.com/ossrs/srs/releases/tag/2.0a1
1300 [r2.0a0]: https://github.com/ossrs/srs/releases/tag/2.0a0 1303 [r2.0a0]: https://github.com/ossrs/srs/releases/tag/2.0a0
@@ -1330,8 +1333,8 @@ Winlin @@ -1330,8 +1333,8 @@ Winlin
1330 [branch2]: https://github.com/ossrs/srs/tree/2.0release 1333 [branch2]: https://github.com/ossrs/srs/tree/2.0release
1331 [release2]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release20 1334 [release2]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release20
1332 [release3]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release30 1335 [release3]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release30
1333 -[centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.195.zip  
1334 -[centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.195.zip 1336 +[centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.205.zip
  1337 +[centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.205.zip
1335 [srs_CN]: https://github.com/ossrs/srs/wiki/v3_CN_Home 1338 [srs_CN]: https://github.com/ossrs/srs/wiki/v3_CN_Home
1336 [srs_EN]: https://github.com/ossrs/srs/wiki/v3_EN_Home 1339 [srs_EN]: https://github.com/ossrs/srs/wiki/v3_EN_Home
1337 1340