Index: third_party/zlib/LICENSE |
diff --git a/third_party/zlib/LICENSE b/third_party/zlib/LICENSE |
index babc0f08940fa7b7972926929fd193903d4d4324..9f056865b5719d4559a7773ca69382b942cb2b02 100644 |
--- a/third_party/zlib/LICENSE |
+++ b/third_party/zlib/LICENSE |
@@ -1,27 +1,19 @@ |
-/* zlib.h -- interface of the 'zlib' general purpose compression library |
- version 1.2.4, March 14th, 2010 |
+version 1.2.11, January 15th, 2017 |
- Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler |
+Copyright (C) 1995-2017 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. |
+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: |
+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 |
- |
-*/ |
- |
-mozzconf.h is distributed under the MPL 1.1/GPL 2.0/LGPL 2.1 tri-license. |
+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. |