From 827cb151f4954ac40028b2e96d4d1bcca4ffd13b Mon Sep 17 00:00:00 2001 From: Max Lv Date: Fri, 17 Jun 2016 16:12:12 +0800 Subject: [PATCH 1/4] Update copy rights --- README.md | 3 ++- src/main/assets/pages/about.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5db7cd09..b342138c 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,8 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala. ### LICENSE -Copyright (C) 2016 Max Lv +Copyright (C) 2016 by Max Lv <> +Copyright (C) 2016 by Mygod Studio <> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/main/assets/pages/about.html b/src/main/assets/pages/about.html index f8aba155..e26db438 100644 --- a/src/main/assets/pages/about.html +++ b/src/main/assets/pages/about.html @@ -274,7 +274,8 @@ img {

A Shadowsocks client for Android, written in Scala.

-

Copyright (C) 2016 Max Lv max.c.lv@gmail.com

+

Copyright (C) 2016 by Max Lv max.c.lv@gmail.com

+

Copyright (C) 2016 by Mygod Studio mygodstudio@gmail.com

This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or From ccccc4e7f7ea68a28d290808b977423f85ecd7ea Mon Sep 17 00:00:00 2001 From: Max Lv Date: Fri, 17 Jun 2016 16:15:30 +0800 Subject: [PATCH 2/4] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b342138c..68973abe 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala. ### CI STATUS -[![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-android.svg)](https://travis-ci.org/shadowsocks/shadowsocks-android) +[![Build Status](https://api.travis-ci.org/shadowsocks/shadowsocks-android.svg)](https://travis-ci.org/shadowsocks/shadowsocks-android) ### PREREQUISITES @@ -66,6 +66,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala. ### LICENSE Copyright (C) 2016 by Max Lv <> + Copyright (C) 2016 by Mygod Studio <> This program is free software: you can redistribute it and/or modify From 6018346dd80fae6cbf6ed0c5634c3c2fe8d98161 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Fri, 17 Jun 2016 16:16:21 +0800 Subject: [PATCH 3/4] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 68973abe..7a028d3d 100644 --- a/README.md +++ b/README.md @@ -65,8 +65,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala. ### LICENSE -Copyright (C) 2016 by Max Lv <> - +Copyright (C) 2016 by Max Lv <>
Copyright (C) 2016 by Mygod Studio <> This program is free software: you can redistribute it and/or modify From 4d907bbdf03390062c7426ce179f94509496861a Mon Sep 17 00:00:00 2001 From: Max Lv Date: Fri, 17 Jun 2016 16:22:05 +0800 Subject: [PATCH 4/4] add AUTHORS --- AUTHORS | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 00000000..78ca1526 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,8 @@ +Shadowsocks-android was originally created in late 2013, by +Max Lv . + +Here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS -- +people who have submitted patches, fixed bugs, added translations, and +generally made shadowsocks-android that much better: + +https://github.com/shadowsocks/shadowsocks-android/graphs/contributors