diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-09-27 15:26:52 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-09-27 15:32:10 -0700 |
| commit | 315e6a996e0c634412df3e5a21a7b9f49122a790 (patch) | |
| tree | 849a86a7894dd020e3811c07c8edc4820a5e9f87 /src/library/scala/util/Properties.scala | |
| parent | 9f16751c6737d2f81fff857562134310b353d603 (diff) | |
| download | scala-315e6a996e0c634412df3e5a21a7b9f49122a790.tar.gz scala-315e6a996e0c634412df3e5a21a7b9f49122a790.tar.bz2 scala-315e6a996e0c634412df3e5a21a7b9f49122a790.zip | |
Including Lightbend in `-version` message.
Also consistently use "LAMP/EPFL" and not "EPFL LAMP".
Diffstat (limited to 'src/library/scala/util/Properties.scala')
| -rw-r--r-- | src/library/scala/util/Properties.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index a176748cd6..fc2302d148 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -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-2016, LAMP/EPFL") + val copyrightString = scalaPropOrElse("copyright.string", "Copyright 2002-2016, LAMP/EPFL and Lightbend, Inc.") /** 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. |