Merge branch 'release/1.1' into develop

dearplain · May 26, 2013 · 99befac · 99befac
2 parents e44cd85 + 81c94a5
commit 99befac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # shadowsocks-go
 
-Current version: 1.0 [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-go.png?branch=develop)](https://travis-ci.org/shadowsocks/shadowsocks-go)
+Current version: 1.1 [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-go.png?branch=develop)](https://travis-ci.org/shadowsocks/shadowsocks-go)
 
 shadowsocks-go is a lightweight tunnel proxy which can help you get through firewalls. It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks).
 

diff --git a/shadowsocks/util.go b/shadowsocks/util.go
@@ -7,7 +7,7 @@ import (
 )
 
 func PrintVersion() {
-	const version = "1.0"
+	const version = "1.1"
 	fmt.Println("shadowsocks-go version", version)
 }