summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-09-07 23:06:43 +0000
committerUlrich Müller <ulm@gentoo.org>2010-09-07 23:06:43 +0000
commit89e96629a7ebd8c3841c7936c00c6d1f3f1730fd (patch)
tree9a7dce601527a8ef13c56ba47c770a30b06fd8d8 /licenses
parenthttp://my.opera.com/desktopteam/blog/2010/09/07/10-62-release-candidate-2 (diff)
downloadgentoo-2-89e96629a7ebd8c3841c7936c00c6d1f3f1730fd.tar.gz
gentoo-2-89e96629a7ebd8c3841c7936c00c6d1f3f1730fd.tar.bz2
gentoo-2-89e96629a7ebd8c3841c7936c00c6d1f3f1730fd.zip
More general license template, bug 336249.
Diffstat (limited to 'licenses')
-rw-r--r--licenses/ZLIB44
1 files changed, 17 insertions, 27 deletions
diff --git a/licenses/ZLIB b/licenses/ZLIB
index 5b1c0f6fdec7..08a134f6295a 100644
--- a/licenses/ZLIB
+++ b/licenses/ZLIB
@@ -1,27 +1,17 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
- version 1.1.4, March 11th, 2002
-
- Copyright (C) 1995-2002 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 jloup@gzip.org
- Mark Adler madler@alumni.caltech.edu
-
-*/
-
-
+Copyright (C) <year> <copyright holders>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the author(s) 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.