summaryrefslogtreecommitdiff
path: root/src/manual
diff options
context:
space:
mode:
authorJosh Suereth <joshua.suereth@gmail.com>2012-11-05 12:52:56 -0500
committerJosh Suereth <joshua.suereth@gmail.com>2012-11-05 12:52:56 -0500
commitaedc853040d7774bd39df43a51715f674f99471e (patch)
tree3d9fad1100c241b8663703898e46c030698eafe7 /src/manual
parent999918311b7bf764916431485cb11043f1c220ed (diff)
parent8b598436f64ca4e980c8a38f642085b4d23e2327 (diff)
downloadscala-aedc853040d7774bd39df43a51715f674f99471e.tar.gz
scala-aedc853040d7774bd39df43a51715f674f99471e.tar.bz2
scala-aedc853040d7774bd39df43a51715f674f99471e.zip
Merge branch '2.10.0-wip' into merge-2.10.0
Diffstat (limited to 'src/manual')
-rw-r--r--src/manual/scala/man1/Command.scala2
-rw-r--r--src/manual/scala/man1/fsc.scala2
-rw-r--r--src/manual/scala/man1/scala.scala2
-rw-r--r--src/manual/scala/man1/scalac.scala2
-rw-r--r--src/manual/scala/man1/scaladoc.scala2
-rw-r--r--src/manual/scala/man1/scalap.scala2
-rw-r--r--src/manual/scala/tools/docutil/EmitHtml.scala2
-rw-r--r--src/manual/scala/tools/docutil/EmitManPage.scala4
-rw-r--r--src/manual/scala/tools/docutil/ManMaker.scala2
-rw-r--r--src/manual/scala/tools/docutil/ManPage.scala2
10 files changed, 11 insertions, 11 deletions
diff --git a/src/manual/scala/man1/Command.scala b/src/manual/scala/man1/Command.scala
index d8f2b22dea..1cf55cb28d 100644
--- a/src/manual/scala/man1/Command.scala
+++ b/src/manual/scala/man1/Command.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
+ * Copyright 2005-2013 LAMP/EPFL
* @author Stephane Micheloud
*/
diff --git a/src/manual/scala/man1/fsc.scala b/src/manual/scala/man1/fsc.scala
index ed5da09828..f2f8feb3fa 100644
--- a/src/manual/scala/man1/fsc.scala
+++ b/src/manual/scala/man1/fsc.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
+ * Copyright 2005-2013 LAMP/EPFL
* @author Stephane Micheloud
*/
diff --git a/src/manual/scala/man1/scala.scala b/src/manual/scala/man1/scala.scala
index c2a0a2ad01..dbd4ea55a2 100644
--- a/src/manual/scala/man1/scala.scala
+++ b/src/manual/scala/man1/scala.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
+ * Copyright 2005-2013 LAMP/EPFL
* @author Stephane Micheloud
*/
diff --git a/src/manual/scala/man1/scalac.scala b/src/manual/scala/man1/scalac.scala
index 9e4df51819..13b1fd58e0 100644
--- a/src/manual/scala/man1/scalac.scala
+++ b/src/manual/scala/man1/scalac.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
+ * Copyright 2005-2013 LAMP/EPFL
* @author Stephane Micheloud
*/
diff --git a/src/manual/scala/man1/scaladoc.scala b/src/manual/scala/man1/scaladoc.scala
index 0f2b1cde8a..34c58b6b8e 100644
--- a/src/manual/scala/man1/scaladoc.scala
+++ b/src/manual/scala/man1/scaladoc.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
+ * Copyright 2005-2013 LAMP/EPFL
* @author Stephane Micheloud
*/
diff --git a/src/manual/scala/man1/scalap.scala b/src/manual/scala/man1/scalap.scala
index 15fd47fb56..472b522e17 100644
--- a/src/manual/scala/man1/scalap.scala
+++ b/src/manual/scala/man1/scalap.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
+ * Copyright 2005-2013 LAMP/EPFL
* @author Stephane Micheloud
*/
diff --git a/src/manual/scala/tools/docutil/EmitHtml.scala b/src/manual/scala/tools/docutil/EmitHtml.scala
index 076626aa1c..731123c4b1 100644
--- a/src/manual/scala/tools/docutil/EmitHtml.scala
+++ b/src/manual/scala/tools/docutil/EmitHtml.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
+ * Copyright 2005-2013 LAMP/EPFL
* @author Stephane Micheloud
* Adapted from Lex Spoon's sbaz manual
*/
diff --git a/src/manual/scala/tools/docutil/EmitManPage.scala b/src/manual/scala/tools/docutil/EmitManPage.scala
index 6b54b316ea..c30e847fee 100644
--- a/src/manual/scala/tools/docutil/EmitManPage.scala
+++ b/src/manual/scala/tools/docutil/EmitManPage.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
+ * Copyright 2005-2013 LAMP/EPFL
* @author Stephane Micheloud
* Adapted from Lex Spoon's sbaz manual
*/
@@ -148,7 +148,7 @@ object EmitManPage {
out println ".\\\" ##########################################################################"
out println ".\\\" # __ #"
out println ".\\\" # ________ ___ / / ___ Scala 2 On-line Manual Pages #"
- out println ".\\\" # / __/ __// _ | / / / _ | (c) 2002-2011, LAMP/EPFL #"
+ out println ".\\\" # / __/ __// _ | / / / _ | (c) 2002-2013, LAMP/EPFL #"
out println ".\\\" # __\\ \\/ /__/ __ |/ /__/ __ | #"
out println ".\\\" # /____/\\___/_/ |_/____/_/ | | http://scala-lang.org/ #"
out println ".\\\" # |/ #"
diff --git a/src/manual/scala/tools/docutil/ManMaker.scala b/src/manual/scala/tools/docutil/ManMaker.scala
index b0781127bb..47b861a80f 100644
--- a/src/manual/scala/tools/docutil/ManMaker.scala
+++ b/src/manual/scala/tools/docutil/ManMaker.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
+ * Copyright 2005-2013 LAMP/EPFL
* @author Stephane Micheloud
* Adapted from Lex Spoon's sbaz manual
*/
diff --git a/src/manual/scala/tools/docutil/ManPage.scala b/src/manual/scala/tools/docutil/ManPage.scala
index 6ecf422cc4..2c5d696bed 100644
--- a/src/manual/scala/tools/docutil/ManPage.scala
+++ b/src/manual/scala/tools/docutil/ManPage.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyright 2005-2012 LAMP/EPFL
+ * Copyright 2005-2013 LAMP/EPFL
* @author Stephane Micheloud
* Adapted from Lex Spoon's sbaz manual
*/
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 12:19:05 +0000