about summary refs log tree commit diff
path: root/license.txt
diff options
context:
space:
mode:
authorMarius "Teelevision" Neugebauer <marius@teele.eu>2014-03-26 19:18:04 +0100
committerMarius "Teelevision" Neugebauer <marius@teele.eu>2014-03-26 19:18:04 +0100
commit58246b4a528d92b2d0863ca7f3e085fbe7c2ecc8 (patch)
treed0c86f03ac67f1602fa6b02937f48e0bd7d62dd3 /license.txt
parent4affc155a906b6091aafc3f9635acc3b8b0aed8a (diff)
downloadzcatch-58246b4a528d92b2d0863ca7f3e085fbe7c2ecc8.tar.gz
zcatch-58246b4a528d92b2d0863ca7f3e085fbe7c2ecc8.zip
initial zCatch/TeeVi commit
Diffstat (limited to 'license.txt')
-rw-r--r--license.txt31
1 files changed, 31 insertions, 0 deletions
diff --git a/license.txt b/license.txt
index 24b0564f..5241dee5 100644
--- a/license.txt
+++ b/license.txt
@@ -1,3 +1,34 @@
+This software called "zCatch/TeeVi" is a modification of "zCatch" which is
+a modification of "Teeworlds".
+
+#############################################################################
+The following license applies only to "zCatch/TeeVi":
+#############################################################################
+
+Copyright (c) 2014 Marius "Teelevision" Neugebauer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+#############################################################################
+The following is the license that "zCatch" was distributed under:
+#############################################################################
+
 Copyright (C) 2007-2012 Magnus Auvinen
 
 This software is provided 'as-is', without any express or implied