[llvm-branch-commits] [clang-tools-extra-branch] r258961 - Merging r258960:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jan 27 12:29:41 2016
New Revision: 258961

URL: http://llvm.org/viewvc/llvm-project?rev=258961&view=rev
Log:
Merging r258960:
------------------------------------------------------------------------
r258960 | hans | 2016-01-27 10:29:16 -0800 (Wed, 27 Jan 2016) | 1 line

docs/conf.py: update copyright year
------------------------------------------------------------------------

Modified:
    clang-tools-extra/branches/release_38/   (props changed)
    clang-tools-extra/branches/release_38/docs/conf.py

Propchange: clang-tools-extra/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 27 12:29:41 2016
@@ -1 +1 @@
-/clang-tools-extra/trunk:258327,258356,258924,258926
+/clang-tools-extra/trunk:258327,258356,258924,258926,258960

Modified: clang-tools-extra/branches/release_38/docs/conf.py
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/branches/release_38/docs/conf.py?rev=258961&r1=258960&r2=258961&view=diff
==============================================================================
--- clang-tools-extra/branches/release_38/docs/conf.py (original)
+++ clang-tools-extra/branches/release_38/docs/conf.py Wed Jan 27 12:29:41 2016
@@ -12,6 +12,7 @@
 # serve to show the default.
 
 import sys, os
+from datetime import date
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -41,7 +42,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Extra Clang Tools'
-copyright = u'2007-2015, The Clang Team'
+copyright = u'2007-%d, The Clang Team' % date.today().year
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the