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

Merge branch 'master' into 1.0release

Browse source
This commit is contained in:
winlin 2015-06-17 16:43:19 +08:00
commit 63c4140171
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
LICENSE
View file

@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2013-2014 winlin
Copyright (c) 2013-2015 SRS(simple-rtmp-server)
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in

2
README.md
View file

@ -232,7 +232,7 @@ git clone https://gitlab.com/winlinvip/srs-gitlab.git
<pre>
git clone https://github.com/simple-rtmp-server/srs &&
cd simple-rtmp-server/trunk
cd srs/trunk
</pre>
<strong>Step 2:</strong> build SRS,