summaryrefslogtreecommitdiff
path: root/engine/SCons/Script/Main.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-06-21 07:06:09 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-06-21 07:06:09 +0200
commit71c19b5c2d38022afb2a5767a3f8da11d0f06444 (patch)
tree1f2a79dfe0ebe98c6b95d5a0a4f5615d9e4afaab /engine/SCons/Script/Main.py
parent3f6052c28746cf9f29443a610ab60f5b02d3b658 (diff)
parentb0f56d74df2a6904ddceb963833d4ea357251853 (diff)
Merge tag 'upstream/2.3.5'
Upstream version 2.3.5
Diffstat (limited to 'engine/SCons/Script/Main.py')
-rw-r--r--engine/SCons/Script/Main.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/SCons/Script/Main.py b/engine/SCons/Script/Main.py
index d7c9f95..2ccc403 100644
--- a/engine/SCons/Script/Main.py
+++ b/engine/SCons/Script/Main.py
@@ -13,7 +13,7 @@ it goes here.
unsupported_python_version = (2, 3, 0)
deprecated_python_version = (2, 7, 0)
-# Copyright (c) 2001 - 2014 The SCons Foundation
+# Copyright (c) 2001 - 2015 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -34,7 +34,7 @@ deprecated_python_version = (2, 7, 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 2014/09/27 12:51:43 garyo"
+__revision__ = "src/engine/SCons/Script/Main.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
import SCons.compat
@@ -1358,7 +1358,7 @@ def main():
pass
parts.append(version_string("engine", SCons))
parts.append(path_string("engine", SCons))
- parts.append("Copyright (c) 2001 - 2014 The SCons Foundation")
+ parts.append("Copyright (c) 2001 - 2015 The SCons Foundation")
version = ''.join(parts)
import SConsOptions