summaryrefslogtreecommitdiffstats
path: root/SConstruct
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2008-12-21 16:01:54 (GMT)
committerSteven Knight <knight@baldmt.com>2008-12-21 16:01:54 (GMT)
commit0178900d41aabd0e55624e35f270f115ed4e3b72 (patch)
tree6e8e10801c18620bd7cce52678e5ef60ef9ebe2b /SConstruct
parenta3057fff3672fbf78ea3d80332e69b7291995bbf (diff)
downloadSCons-0178900d41aabd0e55624e35f270f115ed4e3b72.zip
SCons-0178900d41aabd0e55624e35f270f115ed4e3b72.tar.gz
SCons-0178900d41aabd0e55624e35f270f115ed4e3b72.tar.bz2
Merged revisions 3611-3763,3765-3794,3796-3811,3813-3839,3841-3847 via svnmerge from
http://scons.tigris.org/svn/scons/checkpoint ................ r3765 | stevenknight | 2008-11-04 07:57:03 -0800 (Tue, 04 Nov 2008) | 2 lines Update release info for checkpoint. ................ r3796 | stevenknight | 2008-11-25 21:56:26 -0800 (Tue, 25 Nov 2008) | 2 lines Updates for 20081125 checkpoint release. ................ r3797 | stevenknight | 2008-11-26 08:21:04 -0800 (Wed, 26 Nov 2008) | 2 lines User's Guide updates for changes to error messages. ................ r3813 | stevenknight | 2008-12-07 19:13:17 -0800 (Sun, 07 Dec 2008) | 2 lines Update lines for the 20081207 checkpoint release (candidate for 1.2.0). ................ r3814 | stevenknight | 2008-12-07 19:35:09 -0800 (Sun, 07 Dec 2008) | 2 lines Update troubleshoot.xml for the changes to taskmastertrace output. ................ r3847 | stevenknight | 2008-12-21 07:57:50 -0800 (Sun, 21 Dec 2008) | 9 lines Merged revisions 3610-3840,3842-3846 via svnmerge from http://scons.tigris.org/svn/scons/release ........ r3842 | stevenknight | 2008-12-20 22:48:14 -0800 (Sat, 20 Dec 2008) | 2 lines Update files for 1.2.0. ........ ................
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct4
1 files changed, 2 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index fbd00a2..0395720 100644
--- a/SConstruct
+++ b/SConstruct
@@ -9,7 +9,7 @@
copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008'
# This gets inserted into the man pages to reflect the month of release.
-month_year = 'October 2008'
+month_year = 'December 2008'
#
# __COPYRIGHT__
@@ -45,7 +45,7 @@ import sys
import tempfile
project = 'scons'
-default_version = '1.1.0'
+default_version = '1.2.0'
copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
SConsignFile()