summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/util/DocStrings.scala
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/compiler/scala/tools/nsc/util/DocStrings.scala
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/compiler/scala/tools/nsc/util/DocStrings.scala')
-rwxr-xr-xsrc/compiler/scala/tools/nsc/util/DocStrings.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/util/DocStrings.scala b/src/compiler/scala/tools/nsc/util/DocStrings.scala
index 6113b54403..dde53dc640 100755
--- a/src/compiler/scala/tools/nsc/util/DocStrings.scala
+++ b/src/compiler/scala/tools/nsc/util/DocStrings.scala
@@ -1,5 +1,5 @@
/* NSC -- new Scala compiler
- * Copyright 2006-2012 LAMP/EPFL
+ * Copyright 2006-2013 LAMP/EPFL
* @author Martin Odersky
*/