summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2011-11-27 02:16:07 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2011-11-27 02:16:07 (GMT)
commit2037deddd9b47a7f74ce42129cb8ae0004743511 (patch)
tree6423e3aeba010146caccd7bfeda07f6dd5650c02
parenta7fba7d799b848dd482e2925f2beb002bdd7eac6 (diff)
downloadSCons-2037deddd9b47a7f74ce42129cb8ae0004743511.zip
SCons-2037deddd9b47a7f74ce42129cb8ae0004743511.tar.gz
SCons-2037deddd9b47a7f74ce42129cb8ae0004743511.tar.bz2
Merge Announce.txt and CHANGES.txt back to default branch from 2.1.0 release for continued development.
-rw-r--r--src/Announce.txt9
-rw-r--r--src/CHANGES.txt2
2 files changed, 2 insertions, 9 deletions
diff --git a/src/Announce.txt b/src/Announce.txt
index fd590f5..be3148d 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -19,7 +19,7 @@ effectively, please go to http://scons.org/lists.php#users to sign up for
the scons-users mailing list.
-RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
+RELEASE 2.1.0 - Mon, 09 Sep 2011 20:54:57 -0700
Please consult the RELEASE.txt file for a summary changes since the last
release and consult the CHANGES.txt file for complete a list of changes
@@ -35,15 +35,8 @@ RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
[1] See http://scons.tigris.org/issues/show_bug.cgi?id=2647 for details.
- Please note the following important changes scheduled for the next
- release:
-
- -- FEATURE THAT WILL CHANGE
-
Please note the following important changes since release 2.0.0:
- -- NEW FEATURE
-
-- Support for Latex bibunits package has been added along with
support for tex files generated by other builders.
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index da18539..fbe4f25 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -5,7 +5,7 @@
Change Log
-RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
+RELEASE 2.1.0 - Mon, 09 Sep 2011 20:54:57 -0700
From Anton Lazarev:
- Fix Windows resource compiler scanner to accept DOS line endings.