Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: third_party/libpng/LICENSE

Issue 1509773004: CL for perf tryjob on android Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/libpng/BUILD.gn ('k') | third_party/libpng/README » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libpng/LICENSE
diff --git a/third_party/libpng/LICENSE b/third_party/libpng/LICENSE
index 748a42945aea0508fb0ea64493503e0e2cea92ad..11f6ffe5db47ea0eb803bd509d165c30c751c76a 100644
--- a/third_party/libpng/LICENSE
+++ b/third_party/libpng/LICENSE
@@ -8,11 +8,9 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
If you modify libpng you may insert additional notices immediately following
this sentence.
-pngusr.h is distributed under the MPL 1.1/GPL 2.0/LGPL 2.1 tri-license.
-
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000, through 1.2.54, November 12, 2015, are
+libpng versions 1.0.7, July 1, 2000, through 1.6.19, November 12, 2015, are
Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are
derived from libpng-1.0.6, and are distributed according to the same
disclaimer and license as libpng-1.0.6 with the following individuals
@@ -20,8 +18,10 @@ added to the list of Contributing Authors:
Simon-Pierre Cadieux
Eric S. Raymond
+ Mans Rullgard
Cosmin Truta
Gilles Vollant
+ James Yu
and with the following additions to the disclaimer:
« no previous file with comments | « third_party/libpng/BUILD.gn ('k') | third_party/libpng/README » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698