胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
c8aa34f0 2 parents 8935fe88 6d318402

merge srs2

内嵌 并排对比
正在显示 1 个修改的文件 包含 3 行增加 和 0 行删除
@@ -345,6 +345,7 @@ Remark: @@ -345,6 +345,7 @@ Remark:
345 345
346 ### Releases 346 ### Releases
347 347
  348 +* 2016-11-13, [Release v2.0-b3][r2.0b3], 2.0 beta3, 2.0.223, 86685 lines.
348 * 2016-11-09, [Release v2.0-b2][r2.0b2], 2.0 beta2, 2.0.221, 86691 lines. 349 * 2016-11-09, [Release v2.0-b2][r2.0b2], 2.0 beta2, 2.0.221, 86691 lines.
349 * 2016-09-09, [Release v2.0-b1][r2.0b1], 2.0 beta1, 2.0.215, 89941 lines. 350 * 2016-09-09, [Release v2.0-b1][r2.0b1], 2.0 beta1, 2.0.215, 89941 lines.
350 * 2016-08-06, [Release v2.0-b0][r2.0b0], 2.0 beta0, 2.0.210, 89704 lines. 351 * 2016-08-06, [Release v2.0-b0][r2.0b0], 2.0 beta0, 2.0.210, 89704 lines.
@@ -390,6 +391,7 @@ Remark: @@ -390,6 +391,7 @@ Remark:
390 * v3.0, 2015-08-31, fix [#319][bug #319], http raw api support query global and vhost. 391 * v3.0, 2015-08-31, fix [#319][bug #319], http raw api support query global and vhost.
391 * v3.0, 2015-08-28, fix [#471][bug #471], api response the width and height. 3.0.2 392 * v3.0, 2015-08-28, fix [#471][bug #471], api response the width and height. 3.0.2
392 * v3.0, 2015-08-25, fix [#367][bug #367], support nginx-rtmp exec. 3.0.1 393 * v3.0, 2015-08-25, fix [#367][bug #367], support nginx-rtmp exec. 3.0.1
  394 +* <strong>v2.0, 2016-12-13, [2.0 beta3(2.0.223)][r2.0b3] released. 86685 lines.</strong>
393 * <strong>v2.0, 2016-11-09, [2.0 beta2(2.0.221)][r2.0b2] released. 86691 lines.</strong> 395 * <strong>v2.0, 2016-11-09, [2.0 beta2(2.0.221)][r2.0b2] released. 86691 lines.</strong>
394 * <strong>v2.0, 2016-09-09, [2.0 beta1(2.0.215)][r2.0b1] released. 89941 lines.</strong> 396 * <strong>v2.0, 2016-09-09, [2.0 beta1(2.0.215)][r2.0b1] released. 89941 lines.</strong>
395 * <strong>v2.0, 2016-08-06, [2.0 beta0(2.0.210)][r2.0b0] released. 89704 lines.</strong> 397 * <strong>v2.0, 2016-08-06, [2.0 beta0(2.0.210)][r2.0b0] released. 89704 lines.</strong>
@@ -1310,6 +1312,7 @@ Winlin @@ -1310,6 +1312,7 @@ Winlin
1310 1312
1311 [exo #828]: https://github.com/google/ExoPlayer/pull/828 1313 [exo #828]: https://github.com/google/ExoPlayer/pull/828
1312 1314
  1315 +[r2.0b3]: https://github.com/ossrs/srs/releases/tag/v2.0-b3
1313 [r2.0b2]: https://github.com/ossrs/srs/releases/tag/v2.0-b2 1316 [r2.0b2]: https://github.com/ossrs/srs/releases/tag/v2.0-b2
1314 [r2.0b1]: https://github.com/ossrs/srs/releases/tag/v2.0-b1 1317 [r2.0b1]: https://github.com/ossrs/srs/releases/tag/v2.0-b1
1315 [r2.0b0]: https://github.com/ossrs/srs/releases/tag/v2.0-b0 1318 [r2.0b0]: https://github.com/ossrs/srs/releases/tag/v2.0-b0