From 6a9875843539898afd72d47b799f3b253a4fffba Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 17 Mar 2015 23:51:10 +0800
Subject: [PATCH 1/2] revert the changes for SRS2.

---
 trunk/src/core/srs_core.hpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index 72a4716b3..c6e90da72 100644
--- a/trunk/src/core/srs_core.hpp
+++ b/trunk/src/core/srs_core.hpp
@@ -29,14 +29,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 // current release version
-#define VERSION_MAJOR       3
+#define VERSION_MAJOR       2
 #define VERSION_MINOR       0
-#define VERSION_REVISION    0
 #define VERSION_REVISION    143
 
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"
-#define RTMP_SIG_SRS_CODE "OuXuli"
+#define RTMP_SIG_SRS_CODE "ZhouGuowen"
 #define RTMP_SIG_SRS_ROLE "origin/edge server"
 #define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP Server)"
 #define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server"

From 11b93803de6e46c06b8a58fdb3558d55cf401865 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 17 Mar 2015 23:55:56 +0800
Subject: [PATCH 2/2] revert to SRS2.

---
 README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 92515ba65..0971889db 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 #Simple-RTMP-Server
 
-SRS/3.0，开发代号：[OuXuli](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product#release30)
+SRS/2.0，开发代号：[ZhouGuowen](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product#release20)
 
 SRS定位是运营级的互联网直播服务器集群，追求更好的概念完整性和最简单实现的代码。
 
@@ -560,10 +560,6 @@ Supported operating systems and hardware:
 
 ## History
 
-## SRS 3.0 history
-
-* v3.0, 2015-03-15, fork srs2 and start srs3. 3.0.0
-
 ### SRS 2.0 history
 
 * v2.0, 2015-03-17, for [#155](https://github.com/winlinvip/simple-rtmp-server/issues/155), osx(darwin) support demo with nginx and ffmpeg. 2.0.143.