From 7a2c42626be08b9ccc0ac340834557fe4165358c Mon Sep 17 00:00:00 2001 From: Max Lv Date: Thu, 11 Jun 2015 08:51:48 +0800 Subject: [PATCH] update licenses --- README.md | 10 ++++++++++ src/main/AndroidManifest.xml | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 57f98ab0..f530ed76 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,16 @@ Help to translate shadowsocks: http://crowdin.net/project/shadowsocks/invite [![Google Play](http://developer.android.com/images/brand/en_generic_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=com.github.shadowsocks) +## OPEN SOURCE LICENSES + +* shadowsocks-libev: [GPLv3](https://github.com/shadowsocks/shadowsocks-libev/blob/master/LICENSE) +* tun2socks: [BSD](https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/badvpn/COPYING) +* redsocks: [APL 2.0](https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/redsocks/README) +* OpenSSL: [BSD](https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/openssl/NOTICE) +* pdnsd: [GPLv3](https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/pdnsd/COPYING) +* libev: [GPLv2](https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/libev/LICENSE) +* libevent: [BSD](https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/libevent/LICENSE) + ### CI STATUS [![Build Status](https://drone.io/github.com/shadowsocks/shadowsocks-android/status.png)](https://drone.io/github.com/shadowsocks/shadowsocks-android/latest) diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 883da83b..4c057f70 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="107" + android:versionName="2.6.9">