From 7764805dd1d4df1cf1bdfe2ad1f2e130d91f515a Mon Sep 17 00:00:00 2001
From: Luca Falavigna <dktrkranz@debian.org>
Date: Sat, 23 Jan 2010 15:06:55 +0100
Subject: Imported Upstream version 1.2.0.d20100117

---
 CHANGES.txt | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'CHANGES.txt')

diff --git a/CHANGES.txt b/CHANGES.txt
index baabe0d..c515eac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation
-# src/CHANGES.txt 4577 2009/12/27 19:43:56 scons
+# 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
 
 
                  SCons - a software construction tool
@@ -8,7 +8,7 @@
 
 
 
-RELEASE 1.2.0.d20091224 - Thu, 24 Dec 2009 17:20:55 -08000
+RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800  
 
   From Jim Randall:
     - Fixed temp filename race condition on Windows with long cmd lines.
@@ -128,6 +128,13 @@ RELEASE 1.2.0.d20091224 - Thu, 24 Dec 2009 17:20:55 -08000
       since this works on all platforms.
       Patch from Stefan Hepp.
 
+    - Change scanner to properly search for included file from the
+      directory of the main file instead of the file it is included from.
+      Also update the emitter to add the .aux file associated with
+      \include{filename} commands. This makes sure the required directories
+      if any are created for variantdir cases.
+      Half of the patch from Stefan Hepp.
+
 RELEASE 1.2.0.d20090223 - Mon, 23 Feb 2009 08:41:06 -0800
 
   From Stanislav Baranov:
-- 
cgit v1.2.3