Merge branch 'release/0.1.5'

lparam · Apr 15, 2015 · e617c6f · e617c6f
2 parents 396654a + 4cb8510
commit e617c6f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+v0.1.5 (2015-4-15)
+-----------
+* Fix: Openwrt PKG_VERSION
+
+
 v0.1.4 (2015-4-15)
 -----------
 * Feature: Add tproxy function to OpenWrt init script

diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@
 
 MAJOR = 0
 MINOR = 1
-PATCH = 4
+PATCH = 5
 NAME = xsocks
 
 ifdef O

diff --git a/openwrt/Makefile b/openwrt/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xsocks
-PKG_VERSION:=0.1.4
+PKG_VERSION:=0.1.5
 PKG_RELEASE=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

diff --git a/src/common.h b/src/common.h
@@ -3,7 +3,7 @@
 
 #include "uv.h"
 
-#define XSOCKS_VERSION      "0.1.4"
+#define XSOCKS_VERSION      "0.1.5"
 
 struct server_context {
     int index;