diff options
| author | Seth Tisue <seth@tisue.net> | 2016-02-04 09:09:31 -0500 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2016-02-04 09:09:31 -0500 |
| commit | 42525ec8d072cdd79d3916c09baa063b34a71f25 (patch) | |
| tree | a04941a92dcfb7fc7ca736b656ef542abfe90722 /src | |
| parent | cc6fea6d30609b8879db1ecdbc288e4cdaa5b8d4 (diff) | |
| parent | 310f4d0537a47cfd177cf290479fadc54d7a27a6 (diff) | |
| download | scala-42525ec8d072cdd79d3916c09baa063b34a71f25.tar.gz scala-42525ec8d072cdd79d3916c09baa063b34a71f25.tar.bz2 scala-42525ec8d072cdd79d3916c09baa063b34a71f25.zip | |
Merge pull request #4942 from SethTisue/copyright-2016
bump copyright year to 2016
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 d4a5e2f0e8..7ea597eac9 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-2015, LAMP/EPFL") + val copyrightString = scalaPropOrElse("copyright.string", "Copyright 2002-2016, 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. 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 1b3cfa236f..9daca10e63 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-2015 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://typesafe.com" target="_top">Typesafe</a>.</div> + <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://typesafe.com" target="_top">Typesafe</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 333f6ce715..9bb8d130ea 100644 --- a/src/scalap/decoder.properties +++ b/src/scalap/decoder.properties @@ -1,2 +1,2 @@ version.number=2.0.1 -copyright.string=(c) 2002-2015 LAMP/EPFL +copyright.string=(c) 2002-2016 LAMP/EPFL |