diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-01-23 15:07:01 +0100 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-01-23 15:07:01 +0100 |
| commit | 5d815f9314d2a12f7e92e9cec33f0a9cf6b14883 (patch) | |
| tree | 1db5deb3a8e5075d9a8abe3aae576ae00bab8e56 /engine/SCons/Tool/wix.py | |
| parent | bb7273665583fda5d0ddb30e969718984ea4c205 (diff) | |
| parent | 7764805dd1d4df1cf1bdfe2ad1f2e130d91f515a (diff) | |
Merge commit 'upstream/1.2.0.d20100117'
Diffstat (limited to 'engine/SCons/Tool/wix.py')
| -rw-r--r-- | engine/SCons/Tool/wix.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/SCons/Tool/wix.py b/engine/SCons/Tool/wix.py index 896160c..59e7ce7 100644 --- a/engine/SCons/Tool/wix.py +++ b/engine/SCons/Tool/wix.py @@ -8,7 +8,7 @@ selection method. """ # -# 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 @@ -30,7 +30,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/wix.py 4577 2009/12/27 19:43:56 scons" +__revision__ = "src/engine/SCons/Tool/wix.py 4629 2010/01/17 22:23:21 scons" import SCons.Builder import SCons.Action |