Merge branch 'master' of github.com:shadowsocks/shadowsocks-android

2012-12-28 16:05:48 +08:00
parent 974259c663 2be200a11c
commit acda7e6713
4 changed files with 3 additions and 3 deletions
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="com.github.shadowsocks"
          android:installLocation="auto"
-          android:versionCode="8"
-          android:versionName="1.1.4">
+          android:versionCode="9"
+          android:versionName="1.2.0">

    <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -4,7 +4,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.github.shadowsocks</groupId>
    <artifactId>shadowsocks</artifactId>
-    <version>1.1.4</version>
+    <version>1.2.0</version>
    <packaging>apk</packaging>
    <name>Shadowsocks</name>