third_party/libpng/LICENSE - Issue 1274513004: mention MPL tri-licensed code in our copy of libpng

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/libpng/LICENSE

Issue 1274513004: mention MPL tri-licensed code in our copy of libpng (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « no previous file | no next file » | no next file with comments »

OLD	NEW
1	1

2 This copy of the libpng notices is provided for your convenience. In case of	2 This copy of the libpng notices is provided for your convenience. In case of

3 any discrepancy between this copy and the notices in the file png.h that is	3 any discrepancy between this copy and the notices in the file png.h that is

4 included in the libpng distribution, the latter shall prevail.	4 included in the libpng distribution, the latter shall prevail.

5	5

6 COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:	6 COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:

7	7

8 If you modify libpng you may insert additional notices immediately following	8 If you modify libpng you may insert additional notices immediately following

9 this sentence.	9 this sentence.

10	10

	11 pngusr.h is distributed under the MPL 1.1/GPL 2.0/LGPL 2.1 tri-license.

	12

11 This code is released under the libpng license.	13 This code is released under the libpng license.

12	14

13 libpng versions 1.2.6, August 15, 2004, through 1.2.45, July 7, 2011, are	15 libpng versions 1.2.6, August 15, 2004, through 1.2.45, July 7, 2011, are

14 Copyright (c) 2004, 2006-2009 Glenn Randers-Pehrson, and are	16 Copyright (c) 2004, 2006-2009 Glenn Randers-Pehrson, and are

15 distributed according to the same disclaimer and license as libpng-1.2.5	17 distributed according to the same disclaimer and license as libpng-1.2.5

16 with the following individual added to the list of Contributing Authors	18 with the following individual added to the list of Contributing Authors

17	19

18 Cosmin Truta	20 Cosmin Truta

19	21

20 libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are	22 libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are

(...skipping 81 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102	104

103 Also, the PNG logo (in PNG format, of course) is supplied in the	105 Also, the PNG logo (in PNG format, of course) is supplied in the

104 files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).	106 files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).

105	107

106 Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a	108 Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a

107 certification mark of the Open Source Initiative.	109 certification mark of the Open Source Initiative.

108	110

109 Glenn Randers-Pehrson	111 Glenn Randers-Pehrson

110 glennrp at users.sourceforge.net	112 glennrp at users.sourceforge.net

111 July 7, 2011	113 July 7, 2011

OLD	NEW