summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-01-25 22:22:57 +0000
committermichelou <michelou@epfl.ch>2007-01-25 22:22:57 +0000
commit8c752c3af8fecb6bd81aaa8761519539d563d155 (patch)
tree6d418d53bee09b942fabef9b4e9d55d0f38b3101
parent273be26c4079275790ccc1c529747a7b91509a63 (diff)
downloadscala-2.3.3.tar.gz
scala-2.3.3.tar.bz2
scala-2.3.3.zip
updated copyright date and address of Scala web...v2.3.3
updated copyright date and address of Scala website
-rw-r--r--src/compiler/scala/tools/nsc/MainGenericRunner.scala13
-rw-r--r--src/manual/scala/tools/docutil/resources/index.html6
2 files changed, 11 insertions, 8 deletions
diff --git a/src/compiler/scala/tools/nsc/MainGenericRunner.scala b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
index a91cdde18b..9d17154eae 100644
--- a/src/compiler/scala/tools/nsc/MainGenericRunner.scala
+++ b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyright 2006 LAMP/EPFL
+ * Copyright 2006-2007 LAMP/EPFL
* @author Lex Spoon
*/
@@ -18,9 +18,12 @@ import java.lang.reflect.InvocationTargetException
*/
object MainGenericRunner {
/** Append jars found in ${scala.home}/lib to
- * a specified classpath. Also append "." if the
- * input classpath is empty; otherwise do not.
- */
+ * a specified classpath. Also append "." if the
+ * input classpath is empty; otherwise do not.
+ *
+ * @param classpath
+ * @return ...
+ */
def addClasspathExtras(classpath: String): String = {
val scalaHome = getProperty("scala.home")
@@ -70,7 +73,7 @@ object MainGenericRunner {
val version = getProperty("scala.tool.version", "unknown version")
Console.println(
"Scala code runner version " + version + " -- " +
- "(c) 2002-2006 LAMP/EPFL")
+ "(c) 2002-2007 LAMP/EPFL")
return
}
diff --git a/src/manual/scala/tools/docutil/resources/index.html b/src/manual/scala/tools/docutil/resources/index.html
index eb952e35d1..4319d10d34 100644
--- a/src/manual/scala/tools/docutil/resources/index.html
+++ b/src/manual/scala/tools/docutil/resources/index.html
@@ -8,7 +8,7 @@
<meta http-equiv="Content-Style-Type" content="text/css"/>
<meta http-equiv="Content-Language" content="en"/>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
- <meta name="Copyright" content="(C) 2002-2006 LAMP/EPFL"/>
+ <meta name="Copyright" content="(C) 2002-2007 LAMP/EPFL"/>
<meta name="Language" content="en"/>
<meta name="Description" content="The Scala Programming Language"/>
<meta name="Author" content="Stephane Micheloud"/>
@@ -17,7 +17,7 @@
<body>
<div style="float:left; width:20%;">
- <a href="http://scala.epfl.ch/">
+ <a href="http://scala-lang.org/">
<img src="images/scala_logo.png" alt="Scala" width="80" height="55"/></a>
</div>
<div style="float:right; width:20%;">
@@ -191,7 +191,7 @@
<hr/>
<div style="font-size:x-small;">
- Copyright (c) 2002-2006 <a href="http://www.epfl.ch/">EPFL</a>,
+ Copyright (c) 2002-2007 <a href="http://www.epfl.ch/">EPFL</a>,
Lausanne, unless specified otherwise.<br/>
All rights reserved.
</div>