summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2016-01-14 00:21:50 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2016-01-14 00:21:50 (GMT)
commit004f199b69e50f4418edacb57d6aafbdfa990d15 (patch)
tree0045a4fee98a484dcdb264d368213ce51773d9bf /src
parentefe586285488a4b2087631c54e14b5c07f6f7909 (diff)
downloadSCons-004f199b69e50f4418edacb57d6aafbdfa990d15.zip
SCons-004f199b69e50f4418edacb57d6aafbdfa990d15.tar.gz
SCons-004f199b69e50f4418edacb57d6aafbdfa990d15.tar.bz2
Fix bug 2081: Better messaging for different actions for same target in two environments
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 13a1697..f59eaaf 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -6,8 +6,12 @@
RELEASE VERSION/DATE TO BE FILLED IN LATER
- From Jakub Pola:
- - Intel Compiler 2016 (Linux/Mac) update for tool directories.
+ From Dirk Baechle:
+ - Removed a lot of compatibility methods and workarounds
+ for Python versions < 2.7, in order to prepare the work
+ towards a combined 2.7/3.x version. (PR #284)
+ Also fixed the default arguments for the print_tree and
+ render_tree methods. (PR #284, too)
From William Blevins:
- Added support for cross-language dependency scanning;
@@ -15,12 +19,12 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
- Resolved missing cross-language dependencies for
SWIG bindings (fixes #2264).
- From Dirk Baechle:
- - Removed a lot of compatibility methods and workarounds
- for Python versions < 2.7, in order to prepare the work
- towards a combined 2.7/3.x version. (PR #284)
- Also fixed the default arguments for the print_tree and
- render_tree methods. (PR #284, too)
+ From William Deegan:
+ - Add better messaging when two environments have
+ different actions for the same target (Bug #2024)
+
+ From Jakub Pola:
+ - Intel Compiler 2016 (Linux/Mac) update for tool directories.
RELEASE 2.4.1 - Mon, 07 Nov 2015 10:37:21 -0700