summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2006-04-24 21:19:25 +0000
committerTim Angus <tim@ngus.net>2006-04-24 21:19:25 +0000
commitbd9d761dd958aef00218de084bae00eb9bf788a4 (patch)
treeb31c2a341b217a21ffd9f6430070ff282038a6e5 /COPYING
parent0d8159469509638abe5cecff2a52ab2ef768be0c (diff)
* Removed the media license exceptions section from the license (thanks ydnar)
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING17
1 files changed, 1 insertions, 16 deletions
diff --git a/COPYING b/COPYING
index 7ccea273..88fea84c 100644
--- a/COPYING
+++ b/COPYING
@@ -9,7 +9,7 @@ this license as listed below.
The media is licensed under the CREATIVE COMMONS ATTRIBUTION-SHAREALIKE 2.5
LICENSE. Please read http://creativecommons.org/licenses/by-sa/2.5/ to learn
more about this license. The full license text is contained in the file named
-CC. Please be aware of the exceptions to this license as listed below.
+CC.
---------------------------------------------------- Code License Exceptions ---
@@ -22,18 +22,3 @@ is contained within the files as listed.
src/game/bg_lib.c BSD license
src/client/snd_adpcm.c Stichting Mathematisch Centrum license
src/jpeg-6/* JPEG license
-
-
---------------------------------------------------- Media License Exceptions ---
-
-All shaderlab (http://www.shaderlab.com/) textures (by Randy 'ydnar' Reddig)
-are subject to the following license:
-
- Usage and redistribution policy: Textures may be freely downloaded, modified,
- and used in free maps, mods or total conversions provided this copyright
- notice is left intact and a link to Shaderlab is provided in the credits or
- read-me file. Other non-commercial applications are considered on a
- case-by-case basis via e-mail. All other usage requires written permission.
- Bulk redistribution or archival of the textures in any medium, digital or
- otherwise (except mapping packages for mods) is prohibited.
-