胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
76e8bb2d 2 parents bf9c32f5 e8b3a0f0

Merge branch '1.0release'

内嵌 并排对比
正在显示 2 个修改的文件 包含 2 行增加 和 0 行删除
@@ -21,3 +21,4 @@ CONTRIBUTORS ordered by first contribution. @@ -21,3 +21,4 @@ CONTRIBUTORS ordered by first contribution.
21 * StevenLiu<lq@chinaffmpeg.org> "Build SRS on Darwin OSX" 21 * StevenLiu<lq@chinaffmpeg.org> "Build SRS on Darwin OSX"
22 * zhengfl<zhengfl_1989@126.com> "Bug fixed" 22 * zhengfl<zhengfl_1989@126.com> "Bug fixed"
23 * tufang14<breadbean1449@gmail.com> "Bug fixed" 23 * tufang14<breadbean1449@gmail.com> "Bug fixed"
  24 +
@@ -18,3 +18,4 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR @@ -18,3 +18,4 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
18 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 18 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
19 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 19 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
20 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 20 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  21 +