From d1fac1e2cbaf4f6485995457eb4e5d3332a77142 Mon Sep 17 00:00:00 2001 From: clowwindy Date: Sat, 1 Mar 2014 18:45:15 +0800 Subject: [PATCH] update LICENSE --- About.md | 2 +- LICENSE | 45 ++++++--------------------------------------- about.txt | 31 +++++++++++++++++++++++++++++-- 3 files changed, 36 insertions(+), 42 deletions(-) diff --git a/About.md b/About.md index dceb268..a2d0c16 100644 --- a/About.md +++ b/About.md @@ -1,7 +1,7 @@ [Shadowsocks for iOS](https://github.com/shadowsocks/shadowsocks-iOS) =================== -Copyright (C) 2013 clowwindy +Copyright (C) 2014 clowwindy 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/LICENSE b/LICENSE index 9e1b6b7..fbf73f9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ -Shadowsocks for iOS +Shadowsocks for iOS and OSX -Copyright (C) 2013 clowwindy +Copyright (C) 2014 clowwindy 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 @@ -17,35 +17,10 @@ along with this program. If not, see . ****** -PAC file is created by cow +GFWList -cow -https://github.com/cyfdecyf/cow/ - -Copyright (c) 2012-2013 Chen Yufei. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -* Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +GNU Lesser GPL +https://code.google.com/p/autoproxy-gfwlist/ ****** @@ -315,16 +290,8 @@ alter it and redistribute it freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. - ****** zxing-objc -ZXingObjC is available under the [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0.html). - -****** - -Lcg 3d.gif -http://commons.wikimedia.org/wiki/File:Lcg_3d.gif - -Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled GNU Free Documentation License. +ZXingObjC is available under the [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0.html). \ No newline at end of file diff --git a/about.txt b/about.txt index c5fa662..fbf73f9 100644 --- a/about.txt +++ b/about.txt @@ -1,6 +1,6 @@ -Shadowsocks for iOS +Shadowsocks for iOS and OSX -Copyright (C) 2013 clowwindy +Copyright (C) 2014 clowwindy 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 @@ -268,3 +268,30 @@ Released in MIT License Modified by clowwindy, with some new features https://github.com/clowwindy/AppProxyCap +****** + +base64 + +Created by Matt Gallagher on 2009/06/03. +Copyright 2009 Matt Gallagher. All rights reserved. + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. Permission is granted to anyone to +use this software for any purpose, including commercial applications, and to +alter it and redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source + distribution. + +****** + +zxing-objc + +ZXingObjC is available under the [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0.html). \ No newline at end of file