diff options
| author | mostynb <mostynb@opera.com> | 2015-08-06 11:30:17 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-06 18:30:57 +0000 |
| commit | c752efac1708fba78c0938523fee0c18cef882a2 (patch) | |
| tree | 3b0df57d99fb05ec2c4836fa08f4483aed33bd0b /third_party | |
| parent | 2394d42a6919d67d5e9f4d44771b1fc31be10286 (diff) | |
| download | chromium_src-c752efac1708fba78c0938523fee0c18cef882a2.zip chromium_src-c752efac1708fba78c0938523fee0c18cef882a2.tar.gz chromium_src-c752efac1708fba78c0938523fee0c18cef882a2.tar.bz2 | |
mention NPL/MPL source files in our libjpeg licences
Review URL: https://codereview.chromium.org/1272633005
Cr-Commit-Position: refs/heads/master@{#342151}
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjpeg/LICENSE | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/third_party/libjpeg/LICENSE b/third_party/libjpeg/LICENSE index 096becc..032a810 100644 --- a/third_party/libjpeg/LICENSE +++ b/third_party/libjpeg/LICENSE @@ -73,3 +73,10 @@ We are required to state that "The Graphics Interchange Format(c) is the Copyright property of CompuServe Incorporated. GIF(sm) is a Service Mark property of CompuServe Incorporated." + +-------------------------------------------------------------------------------- + +jconfig.h is distributed under the MPL 1.1/GPL 2.0/LGPL 2.1 tri-license. + +jmorecfg.h contains modifications, which are distributed under the Netscape +Public License. |