From eb39a062e5897abd1dfc407cfc0bb8865832880a Mon Sep 17 00:00:00 2001
From: Apex Liu <apex.liu@qq.com>
Date: Mon, 17 Apr 2017 17:49:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E5=88=B02.2.6.1=EF=BC=8C=E5=87=86=E5=A4=87=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E7=89=88=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/builder/core/ver.py          |   6 +++---
 server/tp_core/core/tp_core.rc     | Bin 5166 -> 5166 bytes
 server/tp_core/core/ts_ver.h       |  12 ++++++------
 server/tp_web/src/tp_web.rc        | Bin 5168 -> 5168 bytes
 server/tp_web/src/ts_ver.h         |  12 ++++++------
 server/www/teleport/app/eom_ver.py |   8 ++++----
 version.in                         |   2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/build/builder/core/ver.py b/build/builder/core/ver.py
index 153b46d..3fd5bd2 100644
--- a/build/builder/core/ver.py
+++ b/build/builder/core/ver.py
@@ -1,3 +1,3 @@
-# -*- coding: utf8 -*-
-VER_TELEPORT_SERVER = "2.2.5.1"
-VER_TELEPORT_ASSIST = "2.2.5.1"
+# -*- coding: utf8 -*-
+VER_TELEPORT_SERVER = "2.2.6.1"
+VER_TELEPORT_ASSIST = "2.2.5.1"
diff --git a/server/tp_core/core/tp_core.rc b/server/tp_core/core/tp_core.rc
index 9cd0fbc29e68e5158fd71849524036039c2d416d..736ce7815e76b2289505ed1e6592734ecfeb4cd9 100644
GIT binary patch
delta 34
mcmZ3du})*d0uDyA$qPC38O=6d<haiSq&9NPgQ$zVv1|a+oeMnx

delta 34
mcmZ3du})*d0uDyg$qPC38BI4|<haiSq&9NPgQ$zVv1|a+Tnjk>

diff --git a/server/tp_core/core/ts_ver.h b/server/tp_core/core/ts_ver.h
index afb273e..69e47d2 100644
--- a/server/tp_core/core/ts_ver.h
+++ b/server/tp_core/core/ts_ver.h
@@ -1,6 +1,6 @@
-#ifndef __TS_SERVER_VER_H__
-#define __TS_SERVER_VER_H__
-
-#define TP_SERVER_VER	L"2.2.5.1"
-
-#endif // __TS_SERVER_VER_H__
+#ifndef __TS_SERVER_VER_H__
+#define __TS_SERVER_VER_H__
+
+#define TP_SERVER_VER	L"2.2.6.1"
+
+#endif // __TS_SERVER_VER_H__
diff --git a/server/tp_web/src/tp_web.rc b/server/tp_web/src/tp_web.rc
index d8d1646a67c515e92f2962fcac4c69facb14739c..9e650a90c3f0a07eec4a37eabf944f722a785b11 100644
GIT binary patch
delta 42
wcmdm>u|Z?Q0uDyA$qPC38O=6d<ao{mq;_&k1F6Y7xn(D_@Cj{Z;nQIQ05b3ldjJ3c

delta 42
wcmdm>u|Z?Q0uDyg$qPC38BI4|<ao{mq;_&k1F6Y7xn(D_@Cj{Z;nQIQ05XpZcK`qY

diff --git a/server/tp_web/src/ts_ver.h b/server/tp_web/src/ts_ver.h
index afb273e..69e47d2 100644
--- a/server/tp_web/src/ts_ver.h
+++ b/server/tp_web/src/ts_ver.h
@@ -1,6 +1,6 @@
-#ifndef __TS_SERVER_VER_H__
-#define __TS_SERVER_VER_H__
-
-#define TP_SERVER_VER	L"2.2.5.1"
-
-#endif // __TS_SERVER_VER_H__
+#ifndef __TS_SERVER_VER_H__
+#define __TS_SERVER_VER_H__
+
+#define TP_SERVER_VER	L"2.2.6.1"
+
+#endif // __TS_SERVER_VER_H__
diff --git a/server/www/teleport/app/eom_ver.py b/server/www/teleport/app/eom_ver.py
index 625508a..ef4d6f5 100644
--- a/server/www/teleport/app/eom_ver.py
+++ b/server/www/teleport/app/eom_ver.py
@@ -1,4 +1,4 @@
-# -*- coding: utf8 -*-
-TS_VER = "2.2.5.1"
-TP_ASSIST_LAST_VER = "2.2.5.1"
-TP_ASSIST_REQUIRE = "2.0.0.1"
+# -*- coding: utf8 -*-
+TS_VER = "2.2.6.1"
+TP_ASSIST_LAST_VER = "2.2.5.1"
+TP_ASSIST_REQUIRE = "2.0.0.1"
diff --git a/version.in b/version.in
index f0acd8c..a089cba 100644
--- a/version.in
+++ b/version.in
@@ -14,6 +14,6 @@ Build ：	构建号。构建号用于表明此版本发布之前进行了多少
 
 
 
-TELEPORT_SERVER 2.2.5.1
+TELEPORT_SERVER 2.2.6.1
 TELEPORT_ASSIST 2.2.5.1
 TELEPORT_ASSIST_REQUIRE 2.0.0.1