summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Managan <ramanagan@att.net>2012-10-24 20:49:44 -0700
committerRobert Managan <ramanagan@att.net>2012-10-24 20:49:44 -0700
commita0bd78c78dae55137a855ec426bcd736b2572301 (patch)
tree399e40e55860a2f9c0010b561e9eb74705370af0
parent0bae86a7174afc66622218f7205c478482f5dcf5 (diff)
parentbb99fa03989327781cbf17a5d552a2bfa6ffd096 (diff)
downloadscons-a0bd78c78dae55137a855ec426bcd736b2572301.tar.gz
merge outstanding commits
-rw-r--r--src/CHANGES.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 29cb6a33..2c89d8df 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -5624,5 +5624,6 @@ A brief overview of important functionality available in release 0.01:
- Windows installer available.
+
__COPYRIGHT__
__FILE__ __REVISION__ __DATE__ __DEVELOPER__