diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-09-21 13:28:45 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-09-21 13:28:45 +0200 |
| commit | d0abf9211981c0335af5bb13015a884ea8358fdc (patch) | |
| tree | 57e39f8070bd56edff4277f6e42ae7f2fa3f8b28 /src | |
| parent | 27aada2d6128d7e06dc3c8bb2f836a000f958d55 (diff) | |
| parent | f799ee98e5fa2d09def7a54c7efcd8427b1d80c7 (diff) | |
| download | scala-d0abf9211981c0335af5bb13015a884ea8358fdc.tar.gz scala-d0abf9211981c0335af5bb13015a884ea8358fdc.tar.bz2 scala-d0abf9211981c0335af5bb13015a884ea8358fdc.zip | |
Merge pull request #4751 from SethTisue/scala-dash-version
bump copyright year in `scala -version`
Diffstat (limited to 'src')
| -rw-r--r-- | src/library/scala/util/Properties.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index 367488f116..d4a5e2f0e8 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2006-2013, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2006-2015, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -105,7 +105,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", "Copyright 2002-2013, LAMP/EPFL") + val copyrightString = scalaPropOrElse("copyright.string", "Copyright 2002-2015, 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. |