summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2012-01-16 21:20:20 -0800
committerWilliam Deegan <bill@baddogconsulting.com>2012-01-16 21:20:20 -0800
commitc1aa05d1ddc5108fb4725c860b84927184e32932 (patch)
tree1769f7c13f4bb4b77f20b0173c914df719155a38
parentbfeb46ba6eecf2faf10f55987d193ebdd6db27e3 (diff)
parentf62034e9135cb1df9e1b4942379f50ffb9213d01 (diff)
downloadscons-c1aa05d1ddc5108fb4725c860b84927184e32932.tar.gz
merged from upstream
-rw-r--r--QMTest/TestSCons.py2
-rw-r--r--SConstruct2
2 files changed, 2 insertions, 2 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 27cfcb89..4f04a486 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -33,7 +33,7 @@ from TestCommon import __all__
default_version = '2.1.0.alpha.yyyymmdd'
-copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011'
+copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012'
python_version_unsupported = (2, 3, 0)
python_version_deprecated = (2, 4, 0)
diff --git a/SConstruct b/SConstruct
index 1748b5bb..337ca409 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,7 +5,7 @@
# When this gets changed, you must also change the copyright_years string
# in QMTest/TestSCons.py so the test scripts look for the right string.
-copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011'
+copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012'
# This gets inserted into the man pages to reflect the month of release.
month_year = 'MONTH YEAR'