Skip to content

Commit

Permalink
update LICENSE
Browse files Browse the repository at this point in the history
  • Loading branch information
clowwindy committed Mar 1, 2014
1 parent 88cb2b2 commit d1fac1e
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 42 deletions.
2 changes: 1 addition & 1 deletion About.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Shadowsocks for iOS](https://github.com/shadowsocks/shadowsocks-iOS)
===================

Copyright (C) 2013 clowwindy <[email protected]>
Copyright (C) 2014 clowwindy <[email protected]>

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
Expand Down
45 changes: 6 additions & 39 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Shadowsocks for iOS
Shadowsocks for iOS and OSX

Copyright (C) 2013 clowwindy <[email protected]>
Copyright (C) 2014 clowwindy <[email protected]>

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
Expand All @@ -17,35 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

******

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/

******

Expand Down Expand Up @@ -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).
31 changes: 29 additions & 2 deletions about.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Shadowsocks for iOS
Shadowsocks for iOS and OSX

Copyright (C) 2013 clowwindy <[email protected]>
Copyright (C) 2014 clowwindy <[email protected]>

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
Expand Down Expand Up @@ -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).

0 comments on commit d1fac1e

Please sign in to comment.