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

update csdn mirror, add 1.0release

This commit is contained in:
winlin 2014-10-10 09:51:25 +08:00
parent d085a5cabc
commit ffabcec191

View file

@ -65,6 +65,10 @@ for ((;;)); do
break
done
git checkout master && git merge srs.master
ret=$?; if [[ 0 -ne $ret ]]; then failed_msg "(master)合并github分支失败, ret=$ret"; exit $ret; fi
ok_msg "(master)合并github分支成功"
#############################################
# branch 1.0release
#############################################