aboutsummaryrefslogtreecommitdiffstats
path: root/options/license/zlib-acknowledgement
diff options
context:
space:
mode:
authorGiteaBot <teabot@gitea.io>2021-03-07 00:12:31 +0000
committerGiteaBot <teabot@gitea.io>2021-03-07 00:12:31 +0000
commit4ba8572361f7d8067efd6b0ce36c259eac6c5b4d (patch)
tree94e5939dafa8571bdbf9c726b2811cfbf76b9957 /options/license/zlib-acknowledgement
parenta68db9076aa47f3464df62edaf35808b428d7c59 (diff)
downloadgitea-4ba8572361f7d8067efd6b0ce36c259eac6c5b4d.tar.gz
gitea-4ba8572361f7d8067efd6b0ce36c259eac6c5b4d.zip
[skip ci] Updated licenses and gitignores
Diffstat (limited to 'options/license/zlib-acknowledgement')
-rw-r--r--options/license/zlib-acknowledgement19
1 files changed, 5 insertions, 14 deletions
diff --git a/options/license/zlib-acknowledgement b/options/license/zlib-acknowledgement
index c35623f011..cf95431f24 100644
--- a/options/license/zlib-acknowledgement
+++ b/options/license/zlib-acknowledgement
@@ -2,23 +2,14 @@ Copyright (c) 2002-2007 Charlie Poole
Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
Copyright (c) 2000-2002 Philip A. Craig
-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 (see the following) in the product documentation is required.
+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 (see the following) in the product documentation is required.
-Portions Copyright (c) 2002-2007 Charlie Poole or Copyright (c) 2002-2004
-James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright (c) 2000-2002
-Philip A. Craig
+ Portions Copyright (c) 2002-2007 Charlie Poole or Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright (c) 2000-2002 Philip A. Craig
-2. Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
+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.