aboutsummaryrefslogtreecommitdiffstats
path: root/options/license/zlib-acknowledgement
diff options
context:
space:
mode:
authorJonas Franz <info@jonasfranz.software>2018-02-12 19:20:30 +0100
committerLauris BH <lauris@nix.lv>2018-02-12 20:20:30 +0200
commitfbdc00f46461bec024026b23f85fd1933ead6a96 (patch)
tree51daef4be36704efd120817993a5581bbc6a6f19 /options/license/zlib-acknowledgement
parent2cb4649acf73ce9a7b6c2b3f707673d89a789f46 (diff)
downloadgitea-fbdc00f46461bec024026b23f85fd1933ead6a96.tar.gz
gitea-fbdc00f46461bec024026b23f85fd1933ead6a96.zip
Updating generate-licenses.go to fetch licenses from maintained repository. (#3484)
Signed-off-by: Jonas Franz <info@jonasfranz.software>
Diffstat (limited to 'options/license/zlib-acknowledgement')
-rw-r--r--options/license/zlib-acknowledgement14
1 files changed, 4 insertions, 10 deletions
diff --git a/options/license/zlib-acknowledgement b/options/license/zlib-acknowledgement
index cf95431f24..86c751571f 100644
--- a/options/license/zlib-acknowledgement
+++ b/options/license/zlib-acknowledgement
@@ -1,15 +1,9 @@
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.
-
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.
-
- 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.
-
-3. This notice may not be removed or altered from any source distribution.
+ 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
+ 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.