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 0ddbf5b9e1dfee1717c01b72145fb214a4b60ef1..138549f86edc1e03dbd8340b0d7773649af7e633 100644 (file)
--- 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 0480a0e87fc7ca1fd171f0470c4ac58b5d0289d8..161a2ef5e5f38cea51d2f9b296476092fbdf2031 100644 (file)
--- 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 3973eb6851225a969f2c3326694436d3b9a52087..810bdddde4c9bf3418a814c49edc5337c82cf7ad 100644 (file)
--- 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.