diff options
author | Luca Falavigna <dktrkranz@debian.org> | 2010-03-10 13:49:40 +0100 |
---|---|---|
committer | Luca Falavigna <dktrkranz@debian.org> | 2010-03-10 13:49:40 +0100 |
commit | eff7b513913aa21f41c6e304dcf5178f8bffa980 (patch) | |
tree | d991f365c5fb334ecc08f245aa008943930b83b9 /engine/SCons/Script | |
parent | 5652ab4cab956f8426b1bc8d6dd0cc4ecf39f51d (diff) | |
parent | 0de5191eaec0321118254673e8f8414228668818 (diff) |
Merge commit 'upstream/1.2.0.d20100306'
Diffstat (limited to 'engine/SCons/Script')
-rw-r--r-- | engine/SCons/Script/Interactive.py | 2 | ||||
-rw-r--r-- | engine/SCons/Script/Main.py | 2 | ||||
-rw-r--r-- | engine/SCons/Script/SConsOptions.py | 2 | ||||
-rw-r--r-- | engine/SCons/Script/SConscript.py | 2 | ||||
-rw-r--r-- | engine/SCons/Script/__init__.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/engine/SCons/Script/Interactive.py b/engine/SCons/Script/Interactive.py index 63fa884..a90c50e 100644 --- a/engine/SCons/Script/Interactive.py +++ b/engine/SCons/Script/Interactive.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/Interactive.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Script/Interactive.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """ SCons interactive mode diff --git a/engine/SCons/Script/Main.py b/engine/SCons/Script/Main.py index e53993d..600fb77 100644 --- a/engine/SCons/Script/Main.py +++ b/engine/SCons/Script/Main.py @@ -34,7 +34,7 @@ it goes here. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/Main.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Script/Main.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/engine/SCons/Script/SConsOptions.py b/engine/SCons/Script/SConsOptions.py index 458589e..47b3915 100644 --- a/engine/SCons/Script/SConsOptions.py +++ b/engine/SCons/Script/SConsOptions.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/SConsOptions.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Script/SConsOptions.py 4691 2010/03/06 16:22:36 bdbaddog" import optparse import re diff --git a/engine/SCons/Script/SConscript.py b/engine/SCons/Script/SConscript.py index 18f1ff1..b2e7220 100644 --- a/engine/SCons/Script/SConscript.py +++ b/engine/SCons/Script/SConscript.py @@ -28,7 +28,7 @@ files. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/SConscript.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Script/SConscript.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons import SCons.Action diff --git a/engine/SCons/Script/__init__.py b/engine/SCons/Script/__init__.py index 2b6f5fc..0c687c3 100644 --- a/engine/SCons/Script/__init__.py +++ b/engine/SCons/Script/__init__.py @@ -34,7 +34,7 @@ it goes here. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/__init__.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Script/__init__.py 4691 2010/03/06 16:22:36 bdbaddog" import time start_time = time.time() |