Merge branch 'master' into 1.0release

2015-06-17 16:43:19 +08:00 · 2015-06-17 16:43:19 +08:00 · 63c4140171
commit 63c4140171
parent 2cfec23f9b 3364959ef9
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -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
--- a/README.md
+++ b/README.md
@ -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,