diff options
| author | Steven Knight <knight@baldmt.com> | 2009-02-25 14:35:17 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-02-25 14:35:17 (GMT) |
| commit | 552d0826e00df9381b5d64787010aeba914ef3e0 (patch) | |
| tree | 7c203b35140269fe5571640c602a3c16a73cee24 | |
| parent | 9f1449d30937b06204d42b87b3b4342d634ccdf1 (diff) | |
| download | SCons-552d0826e00df9381b5d64787010aeba914ef3e0.zip SCons-552d0826e00df9381b5d64787010aeba914ef3e0.tar.gz SCons-552d0826e00df9381b5d64787010aeba914ef3e0.tar.bz2 | |
Merged revisions 3909-4041,4043-4049 via svnmerge from
http://scons.tigris.org/svn/scons/checkpoint
........
r4041 | stevenknight | 2009-02-23 07:06:15 -0800 (Mon, 23 Feb 2009) | 2 lines
Fix embedded carriage returns so merge will apply cleanly.
........
r4043 | stevenknight | 2009-02-23 08:47:32 -0800 (Mon, 23 Feb 2009) | 2 lines
Update release identification for the checkpoint.
........
r4044 | stevenknight | 2009-02-23 09:04:28 -0800 (Mon, 23 Feb 2009) | 2 lines
Add files that conflicted when re-merging.
........
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | src/CHANGES.txt | 2 | ||||
| -rw-r--r-- | src/RELEASE.txt | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -9,7 +9,7 @@ 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 = 'January 2009' +month_year = 'February 2009' # # __COPYRIGHT__ diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 0480a0e..161a2ef 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -8,7 +8,7 @@ -RELEASE X.X.X - XXX +RELEASE 1.2.0.d20090223 - Mon, 23 Feb 2009 08:41:06 -0800 From Stanislav Baranov: diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 3973eb6..810bddd 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.d20090113 - Tue, 13 Jan 2009 02:50:30 -0800 +RELEASE 1.2.0.d20090223 - Mon, 23 Feb 2009 08:41:06 -0800 Please consult the CHANGES.txt file for a list of specific changes since last release. |