summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-08-10 11:21:18 +0200
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-08-10 11:21:21 +0200
commitceb414fa473fe73295b92404df1df15b0e29211c (patch)
tree47c975abfb3f552dfad538c7c0a8c24b0f0e5156
parent9d890c6f96865f65ff1b878e8ea5c6112e4f5f3f (diff)
downloadscala-ceb414fa473fe73295b92404df1df15b0e29211c.tar.gz
scala-ceb414fa473fe73295b92404df1df15b0e29211c.tar.bz2
scala-ceb414fa473fe73295b92404df1df15b0e29211c.zip
some more copyright cleanup for 2012
contributed by Carlo Dapor -- thanks!
-rw-r--r--build.xml2
-rw-r--r--docs/LICENSE2
-rw-r--r--project/Versions.scala2
-rw-r--r--src/compiler/scala/tools/nsc/transform/CleanUp.scala2
4 files changed, 4 insertions, 4 deletions
diff --git a/build.xml b/build.xml
index de73ffc51c..d95c6ab19c 100644
--- a/build.xml
+++ b/build.xml
@@ -225,7 +225,7 @@ PROPERTIES
<property name="dists.dir" value="${basedir}/dists"/>
- <property name="copyright.string" value="Copyright 2002-2011, LAMP/EPFL"/>
+ <property name="copyright.string" value="Copyright 2002-2012, LAMP/EPFL"/>
<property name="partest.version.number" value="0.9.2"/>
<!-- These are NOT the flags used to run SuperSabbus, but the ones written
diff --git a/docs/LICENSE b/docs/LICENSE
index 38d16361bd..de950bdf57 100644
--- a/docs/LICENSE
+++ b/docs/LICENSE
@@ -1,6 +1,6 @@
SCALA LICENSE
-Copyright (c) 2002-2011 EPFL, Lausanne, unless otherwise specified.
+Copyright (c) 2002-2012 EPFL, Lausanne, unless otherwise specified.
All rights reserved.
This software was developed by the Programming Methods Laboratory of the
diff --git a/project/Versions.scala b/project/Versions.scala
index b588ec55ac..cc0ab7ff2b 100644
--- a/project/Versions.scala
+++ b/project/Versions.scala
@@ -67,7 +67,7 @@ object Versions {
IO.write(f, "version.number = "+versions.canonical+"\n"+
"osgi.number = "+versions.osgi+"\n"+
"maven.number = "+versions.maven+"\n"+
- "copyright.string = Copyright 2002-2011, LAMP/EPFL")
+ "copyright.string = Copyright 2002-2012, LAMP/EPFL")
def makeCanonicalVersion(isRelease: Boolean, mvnVersion: String, base: BaseBuildNumber, gitDate: String, gitSha: String): String =
if(isRelease) mvnVersion
diff --git a/src/compiler/scala/tools/nsc/transform/CleanUp.scala b/src/compiler/scala/tools/nsc/transform/CleanUp.scala
index 108c5ced6f..436867257a 100644
--- a/src/compiler/scala/tools/nsc/transform/CleanUp.scala
+++ b/src/compiler/scala/tools/nsc/transform/CleanUp.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyrights 2005-2011 LAMP/EPFL
+ * Copyright 2005-2012 LAMP/EPFL
* @author Martin Odersky
*/