Skip to content

Commit d1fac1e

Browse files
committed
update LICENSE
1 parent 88cb2b2 commit d1fac1e

File tree

3 files changed

+36
-42
lines changed

3 files changed

+36
-42
lines changed

About.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Shadowsocks for iOS](https://github.com/shadowsocks/shadowsocks-iOS)
22
===================
33

4-
Copyright (C) 2013 clowwindy <[email protected]>
4+
Copyright (C) 2014 clowwindy <[email protected]>
55

66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by

LICENSE

+6-39
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Shadowsocks for iOS
1+
Shadowsocks for iOS and OSX
22

3-
Copyright (C) 2013 clowwindy <[email protected]>
3+
Copyright (C) 2014 clowwindy <[email protected]>
44

55
This program is free software: you can redistribute it and/or modify
66
it under the terms of the GNU General Public License as published by
@@ -17,35 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
******
1919

20-
PAC file is created by cow
20+
GFWList
2121

22-
cow
23-
https://github.com/cyfdecyf/cow/
24-
25-
Copyright (c) 2012-2013 Chen Yufei. All rights reserved.
26-
27-
Redistribution and use in source and binary forms, with or without
28-
modification, are permitted provided that the following conditions are
29-
met:
30-
31-
* Redistributions of source code must retain the above copyright
32-
notice, this list of conditions and the following disclaimer.
33-
* Redistributions in binary form must reproduce the above
34-
copyright notice, this list of conditions and the following disclaimer
35-
in the documentation and/or other materials provided with the
36-
distribution.
37-
38-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
39-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
40-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
41-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
42-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
43-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
44-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
45-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
46-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
47-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
48-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
22+
GNU Lesser GPL
23+
https://code.google.com/p/autoproxy-gfwlist/
4924

5025
******
5126

@@ -315,16 +290,8 @@ alter it and redistribute it freely, subject to the following restrictions:
315290
3. This notice may not be removed or altered from any source
316291
distribution.
317292

318-
319293
******
320294

321295
zxing-objc
322296

323-
ZXingObjC is available under the [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0.html).
324-
325-
******
326-
327-
Lcg 3d.gif
328-
http://commons.wikimedia.org/wiki/File:Lcg_3d.gif
329-
330-
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.
297+
ZXingObjC is available under the [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0.html).

about.txt

+29-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Shadowsocks for iOS
1+
Shadowsocks for iOS and OSX
22

3-
Copyright (C) 2013 clowwindy <[email protected]>
3+
Copyright (C) 2014 clowwindy <[email protected]>
44

55
This program is free software: you can redistribute it and/or modify
66
it under the terms of the GNU General Public License as published by
@@ -268,3 +268,30 @@ Released in MIT License
268268
Modified by clowwindy, with some new features
269269
https://github.com/clowwindy/AppProxyCap
270270

271+
******
272+
273+
base64
274+
275+
Created by Matt Gallagher on 2009/06/03.
276+
Copyright 2009 Matt Gallagher. All rights reserved.
277+
278+
This software is provided 'as-is', without any express or implied
279+
warranty. In no event will the authors be held liable for any damages
280+
arising from the use of this software. Permission is granted to anyone to
281+
use this software for any purpose, including commercial applications, and to
282+
alter it and redistribute it freely, subject to the following restrictions:
283+
284+
1. The origin of this software must not be misrepresented; you must not
285+
claim that you wrote the original software. If you use this software
286+
in a product, an acknowledgment in the product documentation would be
287+
appreciated but is not required.
288+
2. Altered source versions must be plainly marked as such, and must not be
289+
misrepresented as being the original software.
290+
3. This notice may not be removed or altered from any source
291+
distribution.
292+
293+
******
294+
295+
zxing-objc
296+
297+
ZXingObjC is available under the [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0.html).

0 commit comments

Comments
 (0)