diff options
| author | Seth Tisue <seth@tisue.net> | 2017-03-06 10:31:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-06 10:31:22 -0800 |
| commit | 828a8923c4f1c6c6c884a18675e2effa91c73197 (patch) | |
| tree | 44b97739049ba908e26f6cf7e0451a4dee82368e /src | |
| parent | 3f437a2aa448907ca608a1b68a9e71e5221c4632 (diff) | |
| parent | c2c37acd928f9b8f8a1d208ee9ee6135b54a1fcd (diff) | |
| download | scala-828a8923c4f1c6c6c884a18675e2effa91c73197.tar.gz scala-828a8923c4f1c6c6c884a18675e2effa91c73197.tar.bz2 scala-828a8923c4f1c6c6c884a18675e2effa91c73197.zip | |
Merge pull request #5753 from Philippus/issue/copyright_year
bump copyright year to 2017 [ci: last-only]
Diffstat (limited to 'src')
| -rw-r--r-- | src/library/scala/util/Properties.scala | 2 | ||||
| -rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala | 2 | ||||
| -rw-r--r-- | src/scalap/decoder.properties | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index 7ea597eac9..416aeeccb3 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-2017, 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. diff --git a/src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala b/src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala index f70bac8f83..08d3508a78 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala +++ b/src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala @@ -280,7 +280,7 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp { if (Set("epfl", "EPFL").contains(tpl.universe.settings.docfooter.value)) - <div id="footer">Scala programming documentation. Copyright (c) 2003-2016 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://www.lightbend.com" target="_top">Lightbend</a>.</div> + <div id="footer">Scala programming documentation. Copyright (c) 2003-2017 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://www.lightbend.com" target="_top">Lightbend</a>.</div> else <div id="footer"> { tpl.universe.settings.docfooter.value } </div> } diff --git a/src/scalap/decoder.properties b/src/scalap/decoder.properties index 9bb8d130ea..0bff4c81d4 100644 --- a/src/scalap/decoder.properties +++ b/src/scalap/decoder.properties @@ -1,2 +1,2 @@ version.number=2.0.1 -copyright.string=(c) 2002-2016 LAMP/EPFL +copyright.string=(c) 2002-2017 LAMP/EPFL |