aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-01-18 18:46:32 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-01-18 18:46:32 +0000
commit6f2b2282421ec76a84df53dfa14f42b0547ae782 (patch)
tree05173f5989093d38bf48d9d4c406ff1b651d45fa
parent2cff147a5d0037a74524ac3742af637ffe1c7467 (diff)
downloadioquake3-aero-6f2b2282421ec76a84df53dfa14f42b0547ae782.tar.gz
ioquake3-aero-6f2b2282421ec76a84df53dfa14f42b0547ae782.zip
* Removed advertising clause from BSD license as per mailing list discussion
git-svn-id: svn://svn.icculus.org/quake3/trunk@506 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/game/bg_lib.c6
-rw-r--r--id-readme.txt6
2 files changed, 2 insertions, 10 deletions
diff --git a/code/game/bg_lib.c b/code/game/bg_lib.c
index 88a2c88..787a9ea 100644
--- a/code/game/bg_lib.c
+++ b/code/game/bg_lib.c
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/id-readme.txt b/id-readme.txt
index a396d9e..55b00f3 100644
--- a/id-readme.txt
+++ b/id-readme.txt
@@ -52,11 +52,7 @@ are met:
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement:
- This product includes software developed by the University of
- California, Berkeley and its contributors.
-4. Neither the name of the University nor the names of its contributors
+3. Neither the name of the University nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.