Merge commit '4c6dcfe934' into 2.12.x

6 files changed, 8 insertions, 8 deletions

diff --git a/build.sbt b/build.sbt
index d56fb99a28..d1342b123a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -131,7 +131,7 @@ lazy val setJarLocation: Setting[_] =
 lazy val scalaSubprojectSettings: Seq[Setting[_]] = commonSettings :+ setJarLocation
 
 lazy val generatePropertiesFileSettings = Seq[Setting[_]](
-  copyrightString := "Copyright 2002-2013, LAMP/EPFL",
+  copyrightString := "Copyright 2002-2015, LAMP/EPFL",
   resourceGenerators in Compile += generateVersionPropertiesFile.map(file => Seq(file)).taskValue,
   generateVersionPropertiesFile := generateVersionPropertiesFileImpl.value
 )
diff --git a/build.xml b/build.xml
index 7ba5dd2b17..540daf98e6 100755
--- a/build.xml
+++ b/build.xml
@@ -183,7 +183,7 @@ TODO:
 
   <property name="dists.dir"               value="${basedir}/dists"/>
 
-  <property name="copyright.string"        value="Copyright 2002-2013, LAMP/EPFL"/>
+  <property name="copyright.string"        value="Copyright 2002-2015, LAMP/EPFL"/>
 
   <!-- These are NOT the flags used to run SuperSabbus, but the ones written
        into the script runners created with scala.tools.ant.ScalaTool -->
diff --git a/doc/LICENSE.md b/doc/LICENSE.md
index 6eab02548d..f38bf4c519 100644
--- a/doc/LICENSE.md
+++ b/doc/LICENSE.md
@@ -2,9 +2,9 @@ Scala is licensed under the [BSD 3-Clause License](http://opensource.org/license
 
 ## Scala License
 
-Copyright (c) 2002-2013 EPFL
+Copyright (c) 2002-2015 EPFL
 
-Copyright (c) 2011-2013 Typesafe, Inc.
+Copyright (c) 2011-2015 Typesafe, Inc.
 
 All rights reserved.
 
diff --git a/doc/License.rtf b/doc/License.rtf
index 541f4d7996..35ff645feb 100644
--- a/doc/License.rtf
+++ b/doc/License.rtf
@@ -10,8 +10,8 @@
 \fs48 Scala License
 \fs40 \
 
-\fs26 Copyright (c) 2002-2013 EPFL\
-Copyright (c) 2011-2013 Typesafe, Inc.\
+\fs26 Copyright (c) 2002-2015 EPFL\
+Copyright (c) 2011-2015 Typesafe, Inc.\
 All rights reserved.\
 \
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\
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 7978cbd137..743c2a401c 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-2013 <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-2015 <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 961c60f48c..333f6ce715 100644
--- a/src/scalap/decoder.properties
+++ b/src/scalap/decoder.properties
@@ -1,2 +1,2 @@
 version.number=2.0.1
-copyright.string=(c) 2002-2013 LAMP/EPFL
+copyright.string=(c) 2002-2015 LAMP/EPFL