diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 17:24:51 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 17:24:51 +0000 |
| commit | 145ecbde35f4fb20cf384fdae4453234407c7243 (patch) | |
| tree | df3d61de8716cb44f4f14597b861313edd348d7e /third_party/zlib | |
| parent | 56e8725fb4649e5dbca1c040d755af24bd45e97a (diff) | |
| download | chromium_src-145ecbde35f4fb20cf384fdae4453234407c7243.zip chromium_src-145ecbde35f4fb20cf384fdae4453234407c7243.tar.gz chromium_src-145ecbde35f4fb20cf384fdae4453234407c7243.tar.bz2 | |
Pass tools/licenses.py for a few more directories.
Getting very close to done.
BUG=39240
Review URL: http://codereview.chromium.org/1559022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
| -rw-r--r-- | third_party/zlib/LICENSE | 25 | ||||
| -rw-r--r-- | third_party/zlib/README.chromium | 1 |
2 files changed, 25 insertions, 1 deletions
diff --git a/third_party/zlib/LICENSE b/third_party/zlib/LICENSE new file mode 100644 index 0000000..23e5e69 --- /dev/null +++ b/third_party/zlib/LICENSE @@ -0,0 +1,25 @@ +/* zlib.h -- interface of the 'zlib' general purpose compression library + version 1.2.4, March 14th, 2010 + + Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly + Mark Adler + +*/ diff --git a/third_party/zlib/README.chromium b/third_party/zlib/README.chromium index aa35c1f..d174a4c 100644 --- a/third_party/zlib/README.chromium +++ b/third_party/zlib/README.chromium @@ -1,7 +1,6 @@ Name: zlib URL: http://zlib.net/ Version: 1.2.3 -License: zlib Description: General purpose compression library |