diff options
| author | Seth Tisue <seth@tisue.net> | 2016-09-28 13:07:11 -0700 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2016-09-28 13:07:11 -0700 |
| commit | a3008d5ff4871a6f4b86b48197f01027ffee4245 (patch) | |
| tree | e770873fcc443ee168cf244b8b09b87fb8d3f6de /src/library/scala/util | |
| parent | 39b236b482202c8f3decc501e779e67f0414999a (diff) | |
| parent | 5757e047a70504991a176aeb2fd8b829d9e9b093 (diff) | |
| download | scala-a3008d5ff4871a6f4b86b48197f01027ffee4245.tar.gz scala-a3008d5ff4871a6f4b86b48197f01027ffee4245.tar.bz2 scala-a3008d5ff4871a6f4b86b48197f01027ffee4245.zip | |
Merge remote-tracking branch 'origin/2.12.0' into merge-2.12.0-to-2.12.x-sep-24
Diffstat (limited to 'src/library/scala/util')
| -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. |