summaryrefslogtreecommitdiff
path: root/src/engine/SCons/Debug.py
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2010-01-23 15:22:14 +0100
committerLuca Falavigna <dktrkranz@debian.org>2010-01-23 15:22:14 +0100
commitaa2da1d1213172ca46db9b6fc6effca70df85981 (patch)
tree27ac30cce760e7959c8face762d06e10bcf9cf8e /src/engine/SCons/Debug.py
parent478c10eaf20dcb9c0b7eeb4693a5f3dea9964ec7 (diff)
parent48f19e9e5ecc069f379ad433fdaf280ac9b54e16 (diff)
Merge commit 'upstream/1.2.0.d20100117'
Diffstat (limited to 'src/engine/SCons/Debug.py')
-rw-r--r--src/engine/SCons/Debug.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Debug.py b/src/engine/SCons/Debug.py
index 5536169..eaacfed 100644
--- a/src/engine/SCons/Debug.py
+++ b/src/engine/SCons/Debug.py
@@ -7,7 +7,7 @@ needed by most users.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@ needed by most users.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Debug.py 4577 2009/12/27 19:44:43 scons"
+__revision__ = "src/engine/SCons/Debug.py 4629 2010/01/17 22:23:21 scons"
import os
import string
@@ -205,7 +205,7 @@ def Trace(msg, file=None, mode='w', tstamp=None):
"""Write a trace message to a file. Whenever a file is specified,
it becomes the default for the next call to Trace()."""
global TraceDefault
- global TimeStamp
+ global TimeStampDefault
global PreviousTime
if file is None:
file = TraceDefault