summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorMatthias Zenger <mzenger@gmail.com>2004-02-17 12:03:29 +0000
committerMatthias Zenger <mzenger@gmail.com>2004-02-17 12:03:29 +0000
commit0ec87d7eb2a7beaf6031e207ec0c2781fd821d6d (patch)
tree21ecd7e8dda09f0d43f4af028d5e347c7bda2f10 /LICENSE
parent1ceb5de993312bda3670b0f6b4e5ef5aaeb06853 (diff)
downloadscala-0ec87d7eb2a7beaf6031e207ec0c2781fd821d6d.tar.gz
scala-0ec87d7eb2a7beaf6031e207ec0c2781fd821d6d.tar.bz2
scala-0ec87d7eb2a7beaf6031e207ec0c2781fd821d6d.zip
Removed advertising clause.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE9
1 files changed, 2 insertions, 7 deletions
diff --git a/LICENSE b/LICENSE
index e9780c956b..5b5172325a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
SCALA LICENSE
-Copyright (c) 2002-04 EPFL, Lausanne.
+Copyright (c) 2002-2004 EPFL, Lausanne.
All rights reserved.
This software was developed by the Programming Methods Laboratory of the
@@ -17,12 +17,7 @@ provided that the following conditions are met:
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 Swiss Federal Institute of
- Technology, Lausanne and its contributors.
-
- 4. Neither the name of the EPFL nor the names of its contributors
+ 3. Neither the name of the EPFL nor the names of its contributors
may be used to endorse or promote products derived from this
software without specific prior written permission.