Merge tag 'upstream/2.3.3'

Upstream version 2.3.3

1 files changed, 33 insertions, 2 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index a0344ea..5ffd18c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,38 @@
 
                             Change Log
 
-RELEASE 2.3.2 - Mon, 04 Jul 2014 17:37:39 -0400
+RELEASE 2.3.3 - Sun, 24 Aug 2014 21:08:33 -0400
+
+  From Roland Stark:
+    - Fixed false line length calculation in the TempFileMunge class (#2970).
+
+  From Gary Oberbrunner:
+    - Improve SWIG detection
+
+  From Russel Winder:
+    - Fix regression on Windows in D language update
+
+  From Anatoly Techtonik:
+    - Do not fail on EnsureSConsVersion when running from checkout
+
+  From Kendrick Boyd and Rob Managan:
+    - Fixed the newglossary action to work with VariantDir (LaTeX).
+
+  From Manuel Francisco Naranjo:
+    - Added a default for the BUILDERS environment variable,
+      to prevent not defined exception on a Clone().
+
+  From Andrew Featherstone:
+    - Added description of CheckTypeSize method (#1991).
+    - Fixed handling of CPPDEFINE var in Append()
+      for several list-dict combinations (#2900).
+
+  From William Blevins:
+    - Added test for Java derived-source dependency tree generation.
+    - Added Copy Action symlink soft-copy support (#2395).
+    - Various contributions to the documentation (UserGuide).
+
+RELEASE 2.3.2
 
   From veon on bitbucket:
     - Fixed handling of nested ifs in CPP scanner PreProcessor class.
@@ -5789,4 +5820,4 @@ A brief overview of important functionality available in release 0.01:
 
 
 Copyright (c) 2001 - 2014 The SCons Foundation
-src/CHANGES.txt  2014/07/05 09:42:21 garyo
+src/CHANGES.txt  2014/08/24 12:12:31 garyo