diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2011-02-10 23:06:43 +0100 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2011-02-10 23:06:43 +0100 |
| commit | 8974746208953bcf6ed03be30329c03445dc0706 (patch) | |
| tree | c3215c5a3bef68871b5fc1a1cea8de708a236d41 /engine/SCons/Script | |
| parent | d474b34e869c73f7dfae5300e81e1721f005ac9b (diff) | |
| parent | 8344b122eb4ee8818cde6ef2bb07726a672a2d23 (diff) | |
Merge commit 'upstream/2.0.1'
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 52fc753..e2906d4 100644 --- a/engine/SCons/Script/Interactive.py +++ b/engine/SCons/Script/Interactive.py @@ -20,7 +20,7 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__revision__ = "src/engine/SCons/Script/Interactive.py 5023 2010/06/14 22:05:46 scons" +__revision__ = "src/engine/SCons/Script/Interactive.py 5134 2010/08/16 23:02:40 bdeegan" __doc__ = """ SCons interactive mode diff --git a/engine/SCons/Script/Main.py b/engine/SCons/Script/Main.py index 2bd1560..31bcff3 100644 --- a/engine/SCons/Script/Main.py +++ b/engine/SCons/Script/Main.py @@ -34,7 +34,7 @@ deprecated_python_version = (2, 4, 0) # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__revision__ = "src/engine/SCons/Script/Main.py 5023 2010/06/14 22:05:46 scons" +__revision__ = "src/engine/SCons/Script/Main.py 5134 2010/08/16 23:02:40 bdeegan" import SCons.compat diff --git a/engine/SCons/Script/SConsOptions.py b/engine/SCons/Script/SConsOptions.py index 913a6ee..8afedf6 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 5023 2010/06/14 22:05:46 scons" +__revision__ = "src/engine/SCons/Script/SConsOptions.py 5134 2010/08/16 23:02:40 bdeegan" import optparse import re diff --git a/engine/SCons/Script/SConscript.py b/engine/SCons/Script/SConscript.py index 5a22db7..5e896f1 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. from __future__ import division -__revision__ = "src/engine/SCons/Script/SConscript.py 5023 2010/06/14 22:05:46 scons" +__revision__ = "src/engine/SCons/Script/SConscript.py 5134 2010/08/16 23:02:40 bdeegan" import SCons import SCons.Action diff --git a/engine/SCons/Script/__init__.py b/engine/SCons/Script/__init__.py index b5b5222..b4545ec 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 5023 2010/06/14 22:05:46 scons" +__revision__ = "src/engine/SCons/Script/__init__.py 5134 2010/08/16 23:02:40 bdeegan" import time start_time = time.time() |