summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2016-10-19 22:24:27 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2016-10-19 22:24:27 (GMT)
commit4c948d70e7eae5cd22f7fed907be7e37032dd3b1 (patch)
treec2f7721c0a911a3556f9862cf903f5e171a765d4
parent3c8bfa673703349a4a1f5b3e8eadc5323c8d460e (diff)
downloadSCons-4c948d70e7eae5cd22f7fed907be7e37032dd3b1.zip
SCons-4c948d70e7eae5cd22f7fed907be7e37032dd3b1.tar.gz
SCons-4c948d70e7eae5cd22f7fed907be7e37032dd3b1.tar.bz2
fix merge issue with CHANGES.txtrel_2.5.0
-rw-r--r--src/CHANGES.txt10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index fd34d35..5aa1eee1 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -16,16 +16,6 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700
- From Tom Tanner:
- - change cache to use 2 character subdirectories, rather than one character,
- so as not to give huge directories for large caches, a situation which
- causes issues for NFS.
- For existing caches, you will need to run the scons-configure-cache.py
- script to update them to the new format. You will get a warning every time
- you build until you co this.
- - Fix a bunch of unit tests on windows
-
-
From Dirk Baechle:
- Removed a lot of compatibility methods and workarounds
for Python versions < 2.7, in order to prepare the work