From fbb05f90998cfec5e132a0d9219d74c76646fd95 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Tue, 20 Jan 2009 14:06:14 +0000 Subject: [PATCH] Merged revisions 3848-3890,3892-3896,3898-3908 via svnmerge from http://scons.tigris.org/svn/scons/checkpoint ........ r3892 | stevenknight | 2009-01-12 06:02:05 -0800 (Mon, 12 Jan 2009) | 2 lines Updates for 1.2.0.d20090112 checkpoint release. ........ r3893 | stevenknight | 2009-01-12 06:07:35 -0800 (Mon, 12 Jan 2009) | 2 lines Fix undefined reference in User's Guide build. ........ r3898 | stevenknight | 2009-01-13 02:44:25 -0800 (Tue, 13 Jan 2009) | 2 lines Update checkpoint timestamps. ........ r3899 | stevenknight | 2009-01-13 06:45:07 -0800 (Tue, 13 Jan 2009) | 2 lines Update expected Copyright year line used in tests. ........ git-svn-id: http://scons.tigris.org/svn/scons/trunk@3909 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- QMTest/TestSCons.py | 2 +- SConstruct | 4 ++-- src/CHANGES.txt | 2 +- src/RELEASE.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index a76c8b4e..4a4941d7 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -44,7 +44,7 @@ from TestCommon import __all__ default_version = '1.2.0' -copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008' +copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009' # In the checked-in source, the value of SConsVersion in the following # line must remain "__ VERSION __" (without the spaces) so the built diff --git a/SConstruct b/SConstruct index 4b386299..0ddbf5b9 100644 --- a/SConstruct +++ b/SConstruct @@ -6,10 +6,10 @@ # 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' +copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009' # This gets inserted into the man pages to reflect the month of release. -month_year = 'December 2008' +month_year = 'January 2009' # # __COPYRIGHT__ diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 2e9b20f9..8d1a9be0 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -8,7 +8,7 @@ -RELEASE 1.X - XXX +RELEASE 1.2.0.d20090113 - Tue, 13 Jan 2009 02:50:30 -0800 From Stanislav Baranov, Ted Johnson and Steven Knight: diff --git a/src/RELEASE.txt b/src/RELEASE.txt index b845cd6e..3bcf9989 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -20,7 +20,7 @@ more effectively, please sign up for the scons-users mailing list at: -RELEASE 1.2.0 - Sat, 20 Dec 2008 22:47:29 -0800 +RELEASE 1.2.0.d20090113 - Tue, 13 Jan 2009 02:50:30 -0800 Please consult the CHANGES.txt file for a list of specific changes since last release. -- 2.26.2