Merge tag 'upstream/2.3.1'

Upstream version 2.3.1

1 files changed, 6 insertions, 3 deletions

diff --git a/src/engine/SCons/TaskmasterTests.py b/src/engine/SCons/TaskmasterTests.py
index ac0c40d..ff5f30d 100644
--- a/src/engine/SCons/TaskmasterTests.py
+++ b/src/engine/SCons/TaskmasterTests.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,7 +22,7 @@
 #
 from __future__ import division
 
-__revision__ = "src/engine/SCons/TaskmasterTests.py  2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/TaskmasterTests.py  2014/03/02 14:18:15 garyo"
 
 import SCons.compat
 
@@ -49,7 +49,7 @@ class Node(object):
         self.scanned = 0
         self.scanner = None
         self.targets = [self]
-        self.prerequisites = []
+        self.prerequisites = None
         class Builder(object):
             def targets(self, node):
                 return node.targets
@@ -141,6 +141,9 @@ class Node(object):
 
         self.clear()
         
+    def release_target_info(self):
+        pass
+
     def has_builder(self):
         return not self.builder is None