diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-10 12:56:14 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-10 12:56:14 +1000 |
| commit | fca51b24115ad17a26a144b394a18471ea356155 (patch) | |
| tree | 28517374ed747afa892f4bcae09e92d5d4dd20f9 /src/scaladoc | |
| parent | b0beb720e70cc8700a593766ad6c384e8826bf52 (diff) | |
| parent | 8f8f81b72ef07140952aeb76120bd032e35cc918 (diff) | |
| download | scala-fca51b24115ad17a26a144b394a18471ea356155.tar.gz scala-fca51b24115ad17a26a144b394a18471ea356155.tar.bz2 scala-fca51b24115ad17a26a144b394a18471ea356155.zip | |
Merge branch '2.11.x' into topic/merge-2.11.x-to-2.12.x-20160210
Conflicts:
src/library/scala/collection/Iterator.scala
|
`-- trivial conflicts only. Parens were added to the
next() calls in 2.12.x, while in the meantime
`{Concat,Join}Iterator` were optimized in 2.11.x
Diffstat (limited to 'src/scaladoc')
| -rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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 d33b31d8ba..6e87f2b0a9 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala +++ b/src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala @@ -284,7 +284,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> } |