[llvm-branch-commits] [llvm-branch] r244798 - Merging r244789:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Aug 12 14:46:15 2015
New Revision: 244798

URL: http://llvm.org/viewvc/llvm-project?rev=244798&view=rev
Log:
Merging r244789:
------------------------------------------------------------------------
r244789 | hans | 2015-08-12 11:27:23 -0700 (Wed, 12 Aug 2015) | 1 line

Docs: keep copyright years up-to-date.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_37/   (props changed)
    llvm/branches/release_37/docs/conf.py

Propchange: llvm/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 12 14:46:15 2015
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,242236,242239,242281,242288,242296,242331,242341,242410,242412,242433-242434,242442,242543,242673,242680,242706,242721-242722,242733-242735,242742,242869,242919,242993,243001,243057,243116,243263,243294,243361,243469,243485,243500,243519,243531,243589,243609,243636,243638-243640,243745,243891,243898,243927,243932,243934,243984,243986,243999,244058,244123,244418,244554,244644,244676
+/llvm/trunk:155241,242236,242239,242281,242288,242296,242331,242341,242410,242412,242433-242434,242442,242543,242673,242680,242706,242721-242722,242733-242735,242742,242869,242919,242993,243001,243057,243116,243263,243294,243361,243469,243485,243500,243519,243531,243589,243609,243636,243638-243640,243745,243891,243898,243927,243932,243934,243984,243986,243999,244058,244123,244418,244554,244644,244676,244789

Modified: llvm/branches/release_37/docs/conf.py
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_37/docs/conf.py?rev=244798&r1=244797&r2=244798&view=diff
==============================================================================
--- llvm/branches/release_37/docs/conf.py (original)
+++ llvm/branches/release_37/docs/conf.py Wed Aug 12 14:46:15 2015
@@ -11,6 +11,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
@@ -40,7 +41,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'LLVM'
-copyright = u'2003-2014, LLVM Project'
+copyright = u'2003-%d, LLVM Project' % 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