diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-11-05 12:52:56 -0500 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-11-05 12:52:56 -0500 |
| commit | aedc853040d7774bd39df43a51715f674f99471e (patch) | |
| tree | 3d9fad1100c241b8663703898e46c030698eafe7 /src/manual/scala/man1 | |
| parent | 999918311b7bf764916431485cb11043f1c220ed (diff) | |
| parent | 8b598436f64ca4e980c8a38f642085b4d23e2327 (diff) | |
| download | scala-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/scala/man1')
| -rw-r--r-- | src/manual/scala/man1/Command.scala | 2 | ||||
| -rw-r--r-- | src/manual/scala/man1/fsc.scala | 2 | ||||
| -rw-r--r-- | src/manual/scala/man1/scala.scala | 2 | ||||
| -rw-r--r-- | src/manual/scala/man1/scalac.scala | 2 | ||||
| -rw-r--r-- | src/manual/scala/man1/scaladoc.scala | 2 | ||||
| -rw-r--r-- | src/manual/scala/man1/scalap.scala | 2 |
6 files changed, 6 insertions, 6 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 */ |