summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2012-08-14 00:12:13 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2012-08-14 00:12:13 (GMT)
commit6db1108bb06d67e9d533f4cbedab98d1a4a79082 (patch)
treea75188d2191f1cdf6121b666152ad3e049ef79e0
parent80f77401bad632ab355f9fb5b36777d9f214cd3e (diff)
parent6658b6e89046ea5dc58b36bb95d9c9a9c7ea1e6a (diff)
downloadSCons-6db1108bb06d67e9d533f4cbedab98d1a4a79082.zip
SCons-6db1108bb06d67e9d533f4cbedab98d1a4a79082.tar.gz
SCons-6db1108bb06d67e9d533f4cbedab98d1a4a79082.tar.bz2
Merged.
-rw-r--r--ReleaseConfig2
-rw-r--r--review.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/ReleaseConfig b/ReleaseConfig
index 0a5e606..c7943a1 100644
--- a/ReleaseConfig
+++ b/ReleaseConfig
@@ -50,7 +50,7 @@ deprecated_python_version = (2, 4, 0)
#month_year = 'December 2012'
# If copyright years is not given, the release year is used as the end.
-#copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010'
+#copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012'
# Local Variables:
# tab-width:4
diff --git a/review.py b/review.py
index ea09923..23e4b10 100644
--- a/review.py
+++ b/review.py
@@ -1802,3 +1802,4 @@ def main():
if __name__ == "__main__":
main()
+