diff options
author | Luca Falavigna <dktrkranz@debian.org> | 2010-03-25 20:52:01 +0100 |
---|---|---|
committer | Luca Falavigna <dktrkranz@debian.org> | 2010-03-25 20:52:01 +0100 |
commit | 7edc4d959cd4a1153e5b17881fdca3ca8df2e72a (patch) | |
tree | ac00f5c3c16b8e546dc76ebde33191ca3088a8c5 /src/engine/SCons/compat | |
parent | 805ec8fc457a6d89d4c7896eb33b398729a06fbe (diff) | |
parent | e7885e3af440eaef38a9301fd92a105afc8ddebb (diff) |
Merge commit 'upstream/1.3.0'
Diffstat (limited to 'src/engine/SCons/compat')
-rw-r--r-- | src/engine/SCons/compat/__init__.py | 2 | ||||
-rw-r--r-- | src/engine/SCons/compat/_scons_UserString.py | 2 | ||||
-rw-r--r-- | src/engine/SCons/compat/_scons_hashlib.py | 2 | ||||
-rw-r--r-- | src/engine/SCons/compat/_scons_itertools.py | 2 | ||||
-rw-r--r-- | src/engine/SCons/compat/_scons_platform.py | 2 | ||||
-rw-r--r-- | src/engine/SCons/compat/builtins.py | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/engine/SCons/compat/__init__.py b/src/engine/SCons/compat/__init__.py index 87c75e4..165dddf 100644 --- a/src/engine/SCons/compat/__init__.py +++ b/src/engine/SCons/compat/__init__.py @@ -60,7 +60,7 @@ function defined below loads the module as the "real" name (without the rest of our code will find our pre-loaded compatibility module. """ -__revision__ = "src/engine/SCons/compat/__init__.py 4691 2010/03/06 16:22:36 bdbaddog" +__revision__ = "src/engine/SCons/compat/__init__.py 4720 2010/03/24 03:14:11 jars" def import_as(module, name): """ diff --git a/src/engine/SCons/compat/_scons_UserString.py b/src/engine/SCons/compat/_scons_UserString.py index 9c96bdc..f8c462e 100644 --- a/src/engine/SCons/compat/_scons_UserString.py +++ b/src/engine/SCons/compat/_scons_UserString.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/compat/_scons_UserString.py 4691 2010/03/06 16:22:36 bdbaddog" +__revision__ = "src/engine/SCons/compat/_scons_UserString.py 4720 2010/03/24 03:14:11 jars" __doc__ = """ A user-defined wrapper around string objects diff --git a/src/engine/SCons/compat/_scons_hashlib.py b/src/engine/SCons/compat/_scons_hashlib.py index d00f177..b325e33 100644 --- a/src/engine/SCons/compat/_scons_hashlib.py +++ b/src/engine/SCons/compat/_scons_hashlib.py @@ -31,7 +31,7 @@ purposes, anyway). In fact, this module will raise an ImportError if the underlying md5 module isn't available. """ -__revision__ = "src/engine/SCons/compat/_scons_hashlib.py 4691 2010/03/06 16:22:36 bdbaddog" +__revision__ = "src/engine/SCons/compat/_scons_hashlib.py 4720 2010/03/24 03:14:11 jars" import md5 import string diff --git a/src/engine/SCons/compat/_scons_itertools.py b/src/engine/SCons/compat/_scons_itertools.py index 4c66894..44add7c 100644 --- a/src/engine/SCons/compat/_scons_itertools.py +++ b/src/engine/SCons/compat/_scons_itertools.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/compat/_scons_itertools.py 4691 2010/03/06 16:22:36 bdbaddog" +__revision__ = "src/engine/SCons/compat/_scons_itertools.py 4720 2010/03/24 03:14:11 jars" __doc__ = """ Implementations of itertools functions for Python versions that don't diff --git a/src/engine/SCons/compat/_scons_platform.py b/src/engine/SCons/compat/_scons_platform.py index 8af807e..6ac9b61 100644 --- a/src/engine/SCons/compat/_scons_platform.py +++ b/src/engine/SCons/compat/_scons_platform.py @@ -29,7 +29,7 @@ functionality. It only wraps the portions of platform functionality used by SCons. """ -__revision__ = "src/engine/SCons/compat/_scons_platform.py 4691 2010/03/06 16:22:36 bdbaddog" +__revision__ = "src/engine/SCons/compat/_scons_platform.py 4720 2010/03/24 03:14:11 jars" ### Portable uname() interface diff --git a/src/engine/SCons/compat/builtins.py b/src/engine/SCons/compat/builtins.py index 2c1fa32..e687885 100644 --- a/src/engine/SCons/compat/builtins.py +++ b/src/engine/SCons/compat/builtins.py @@ -55,7 +55,7 @@ the FUNCTIONS or DATA output, that means those names are already built in to this version of Python and we don't need to add them from this module. """ -__revision__ = "src/engine/SCons/compat/builtins.py 4691 2010/03/06 16:22:36 bdbaddog" +__revision__ = "src/engine/SCons/compat/builtins.py 4720 2010/03/24 03:14:11 jars" import __builtin__ |