diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-03-25 20:26:34 +0100 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-03-25 20:26:34 +0100 |
| commit | 738c66a8458f4ddd5c11871359938bc9d89e8d7a (patch) | |
| tree | 5b57e837a551c1479efec2e2bfebf154c529bf68 /engine/SCons/Script | |
| parent | 8f9034d6737799e699f3d2c9c7de2c98682343bd (diff) | |
| parent | 86baccee0a1dddf43f7eefe48e2d9e9037468b9c (diff) | |
Merge commit 'upstream/1.3.0'
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 a90c50e..6218021 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 4691 2010/03/06 16:22:36 bdbaddog" +__revision__ = "src/engine/SCons/Script/Interactive.py 4720 2010/03/24 03:14:11 jars" __doc__ = """ SCons interactive mode diff --git a/engine/SCons/Script/Main.py b/engine/SCons/Script/Main.py index 600fb77..74a28f2 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 4691 2010/03/06 16:22:36 bdbaddog" +__revision__ = "src/engine/SCons/Script/Main.py 4720 2010/03/24 03:14:11 jars" import os import os.path diff --git a/engine/SCons/Script/SConsOptions.py b/engine/SCons/Script/SConsOptions.py index 47b3915..545162b 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 4691 2010/03/06 16:22:36 bdbaddog" +__revision__ = "src/engine/SCons/Script/SConsOptions.py 4720 2010/03/24 03:14:11 jars" import optparse import re diff --git a/engine/SCons/Script/SConscript.py b/engine/SCons/Script/SConscript.py index b2e7220..98a3126 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 4691 2010/03/06 16:22:36 bdbaddog" +__revision__ = "src/engine/SCons/Script/SConscript.py 4720 2010/03/24 03:14:11 jars" import SCons import SCons.Action diff --git a/engine/SCons/Script/__init__.py b/engine/SCons/Script/__init__.py index 0c687c3..97af6da 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 4691 2010/03/06 16:22:36 bdbaddog" +__revision__ = "src/engine/SCons/Script/__init__.py 4720 2010/03/24 03:14:11 jars" import time start_time = time.time() |