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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | 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 4fe0e61c48e31a4504f435dc995f91d4833a104b..a975864f9630c945487234930148424ef5be233c 100644
--- a/third_party/libpng/LICENSE
+++ b/third_party/libpng/LICENSE
@@ -8,6 +8,8 @@ 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.2.6, August 15, 2004, through 1.2.45, July 7, 2011, are
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698