Merge commit 'upstream/1.2.0.d20100306'

1 files changed, 39 insertions, 1 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index c515eac..d345aec 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -1,5 +1,5 @@
 # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
-# src/CHANGES.txt 4629 2010/01/17 22:23:21 scons
+# src/CHANGES.txt 4691 2010/03/06 16:22:36 bdbaddog
 
 
                  SCons - a software construction tool
@@ -8,6 +8,44 @@
 
 
 
+RELEASE 1.2.0.d20100306 - Sat, 06 Mar 2010 16:18:33 -0800
+
+  From Luca Falavigna:
+
+    - Fix typos in the man page.
+
+  From Gottfried Ganssauge:
+
+    - Support execution when SCons is installed via easy_install.
+
+  From Steven Knight:
+
+    - Make the messages for Configure checks of compilers consistent.
+
+    - Issue an error message if a BUILDERS entry is not a Builder
+      object or a callable wrapper.
+
+  From Rob Managan:
+
+    - Update tex builder to handle the case where a \input{foo}
+      command tries to work with a directory named foo instead of the
+      file foo.tex. The builder now ignores a directory and continues
+      searching to find the correct file. Thanks to Lennart Sauerbeck
+      for the test case and initial patch
+      
+      Also allow the \include of files in subdirectories when variantDir
+      is used with duplicate=0. Previously latex would crash since 
+      the directory in which the .aux file is written was not created.
+      Thanks to Stefan Hepp for finding this and part of the solution.
+
+  From James Teh:
+    - Patches to fix some issues using MS SDK V7.0
+
+  From William Deegan:
+    - Lots of testing and minor patches to handle mixed MS VC and SDK
+      installations, as well as having only the SDK installed.
+
+
 RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800  
 
   From Jim Randall: