summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-01-07 13:24:59 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-01-07 13:24:59 -0800
commit1381cda86ddeca1b9829a9c53ff9372cfd816735 (patch)
treeae722406b634489c1adac5c74faf289a2197dfc0 /src/library
parent766bb97114b5932b75340a9169558de61899997e (diff)
parent77c8751c9107e5ca73181c15ccf31fce81c7de47 (diff)
downloadscala-1381cda86ddeca1b9829a9c53ff9372cfd816735.tar.gz
scala-1381cda86ddeca1b9829a9c53ff9372cfd816735.tar.bz2
scala-1381cda86ddeca1b9829a9c53ff9372cfd816735.zip
Merge pull request #1843 from JamesIry/SI-6915_2.10.x
SI-6915 Updates copyright properties to 2002-2013
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/util/Properties.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala
index fd1364c2dc..cc145134c4 100644
--- a/src/library/scala/util/Properties.scala
+++ b/src/library/scala/util/Properties.scala
@@ -102,7 +102,7 @@ private[scala] trait PropertiesTrait {
* or "version (unknown)" if it cannot be determined.
*/
val versionString = "version " + scalaPropOrElse("version.number", "(unknown)")
- val copyrightString = scalaPropOrElse("copyright.string", "(c) 2002-2011 LAMP/EPFL")
+ val copyrightString = scalaPropOrElse("copyright.string", "Copyright 2002-2013, LAMP/EPFL")
/** This is the encoding to use reading in source files, overridden with -encoding
* Note that it uses "prop" i.e. looks in the scala jar, not the system properties.