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

merge from srs2

This commit is contained in:
winlin 2015-10-20 16:41:59 +08:00
commit d115f53770

View file

@ -1281,7 +1281,7 @@ Winlin
[bug #502]: https://github.com/simple-rtmp-server/srs/issues/502
[bug #xxxxxxx]: https://github.com/simple-rtmp-server/srs/issues/xxxxxxx
[r2.0a2]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a2
[r2.0a2]: https://github.com/simple-rtmp-server/srs/releases/tag/v2.0-a2
[r2.0a1]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a1
[r2.0a0]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a0
[r1.0r4]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r4