summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2004-01-22 15:03:16 +0000
committermichelou <michelou@epfl.ch>2004-01-22 15:03:16 +0000
commit25412bcee83f3fb99626eed841ff395a2da6aea9 (patch)
tree0e21af2d491decae56fb3bf15bb617c741359a84 /LICENSE
parentb711111204291b046e1ffd17ed495675bfa2f765 (diff)
downloadscala-25412bcee83f3fb99626eed841ff395a2da6aea9.tar.gz
scala-25412bcee83f3fb99626eed841ff395a2da6aea9.tar.bz2
scala-25412bcee83f3fb99626eed841ff395a2da6aea9.zip
- updated copyright date from 2003 to 2002-04
- changed term 'University' to 'EPFL'.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE6
1 files changed, 3 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE
index 669ca0fe87..e9780c956b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,10 +1,10 @@
SCALA LICENSE
-Copyright (c) 2003 Swiss Federal Institute of Technology, Lausanne.
+Copyright (c) 2002-04 EPFL, Lausanne.
All rights reserved.
This software was developed by the Programming Methods Laboratory of the
-Swiss Federal Institute of Technology, Lausanne, Switzerland.
+Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland.
Permission to use, copy, modify, and distribute this software in source
or binary form for any purpose with or without fee is hereby granted,
@@ -22,7 +22,7 @@ provided that the following conditions are met:
includes software developed by the Swiss Federal Institute of
Technology, Lausanne and its contributors.
- 4. Neither the name of the University nor the names of its contributors
+ 4. 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.