From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Wed, 25 Feb 2009 14:35:17 +0000 (+0000)
Subject: Merged revisions 3909-4041,4043-4049 via svnmerge from
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7e7462f8f5a21221f4dacce1e8eb33b25ec396e;p=scons.git

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.
........


git-svn-id: http://scons.tigris.org/svn/scons/trunk@4050 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---

diff --git a/SConstruct b/SConstruct
index 0ddbf5b9..138549f8 100644
--- a/SConstruct
+++ b/SConstruct
@@ -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 0480a0e8..161a2ef5 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 3973eb68..810bdddd 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.