third_party/zlib/LICENSE - Issue 1279843003: mention MPL tri-licensed code in our copy of zlib

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/zlib/LICENSE

Issue 1279843003: mention MPL tri-licensed code in our copy of zlib (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 /* zlib.h -- interface of the 'zlib' general purpose compression library	1 /* zlib.h -- interface of the 'zlib' general purpose compression library

2 version 1.2.4, March 14th, 2010	2 version 1.2.4, March 14th, 2010

3	3

4 Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler	4 Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler

5	5

6 This software is provided 'as-is', without any express or implied	6 This software is provided 'as-is', without any express or implied

7 warranty. In no event will the authors be held liable for any damages	7 warranty. In no event will the authors be held liable for any damages

8 arising from the use of this software.	8 arising from the use of this software.

9	9

10 Permission is granted to anyone to use this software for any purpose,	10 Permission is granted to anyone to use this software for any purpose,

11 including commercial applications, and to alter it and redistribute it	11 including commercial applications, and to alter it and redistribute it

12 freely, subject to the following restrictions:	12 freely, subject to the following restrictions:

13	13

14 1. The origin of this software must not be misrepresented; you must not	14 1. The origin of this software must not be misrepresented; you must not

15 claim that you wrote the original software. If you use this software	15 claim that you wrote the original software. If you use this software

16 in a product, an acknowledgment in the product documentation would be	16 in a product, an acknowledgment in the product documentation would be

17 appreciated but is not required.	17 appreciated but is not required.

18 2. Altered source versions must be plainly marked as such, and must not be	18 2. Altered source versions must be plainly marked as such, and must not be

19 misrepresented as being the original software.	19 misrepresented as being the original software.

20 3. This notice may not be removed or altered from any source distribution.	20 3. This notice may not be removed or altered from any source distribution.

21	21

22 Jean-loup Gailly	22 Jean-loup Gailly

23 Mark Adler	23 Mark Adler

24	24

25 */	25 */

	26

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

OLD	NEW