summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@iij.ad.jp>2014-12-03 14:07:14 +0900
committerBert Belder <bertbelder@gmail.com>2015-01-08 23:59:54 +0100
commitb8891d6599612dc2e011a2d28846d2c9f6e286e5 (patch)
tree5e670425f07f5d0afa9aa1c53f41c5b6147340e8 /LICENSE
parent6f532e5da19fca38bceed70c810b815ede8efb1c (diff)
downloadandroid-node-v8-b8891d6599612dc2e011a2d28846d2c9f6e286e5.tar.gz
android-node-v8-b8891d6599612dc2e011a2d28846d2c9f6e286e5.tar.bz2
android-node-v8-b8891d6599612dc2e011a2d28846d2c9f6e286e5.zip
doc: update the zlib license after upgrading
Reviewed-By: Bert Belder <bertbelder@gmail.com>
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE9
1 files changed, 4 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index 75027399df..b793e8c94f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -294,9 +294,9 @@ maintained libraries. The externally maintained libraries used by Node are:
- Zlib at deps/zlib. zlib's license follows:
"""
/* zlib.h -- interface of the 'zlib' general purpose compression library
- version 1.2.4, March 14th, 2010
+ version 1.2.8, April 28th, 2013
- Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+ Copyright (C) 1995-2013 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
@@ -314,9 +314,8 @@ maintained libraries. The externally maintained libraries used by Node are:
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
- Jean-loup Gailly
- Mark Adler
-
+ Jean-loup Gailly Mark Adler
+ jloup@gzip.org madler@alumni.caltech.edu
*/
"""