Merge tag 'upstream/2.3.5'

Upstream version 2.3.5

4 files changed, 17 insertions, 17 deletions

diff --git a/script/scons b/script/scons
index c917f47..155725a 100644
--- a/script/scons
+++ b/script/scons
@@ -2,7 +2,7 @@
 #
 # SCons - a Software Constructor
 #
-# 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
@@ -23,17 +23,17 @@
 # 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/script/scons.py  2014/09/27 12:51:43 garyo"
+__revision__ = "src/script/scons.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
 
-__version__ = "2.3.4"
+__version__ = "2.3.5"
 
 __build__ = ""
 
-__buildsys__ = "lubuntu"
+__buildsys__ = "ubuntu1404-32bit"
 
-__date__ = "2014/09/27 12:51:43"
+__date__ = "2015/06/18 06:53:27"
 
-__developer__ = "garyo"
+__developer__ = "bdbaddog"
 
 import os
 import sys
diff --git a/script/scons-time b/script/scons-time
index 0a3176b..8ca1ac6 100644
--- a/script/scons-time
+++ b/script/scons-time
@@ -9,7 +9,7 @@
 #
 
 #
-# 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
@@ -32,7 +32,7 @@
 from __future__ import division
 from __future__ import nested_scopes
 
-__revision__ = "src/script/scons-time.py  2014/09/27 12:51:43 garyo"
+__revision__ = "src/script/scons-time.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
 
 import getopt
 import glob
diff --git a/script/scons.bat b/script/scons.bat
index 75aa236..3f3069b 100644
--- a/script/scons.bat
+++ b/script/scons.bat
@@ -1,11 +1,11 @@
-@REM Copyright (c) 2001 - 2014 The SCons Foundation

-@REM src/script/scons.bat  2014/09/27 12:51:43 garyo

+@REM Copyright (c) 2001 - 2015 The SCons Foundation

+@REM src/script/scons.bat pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog

 @echo off

 set SCONS_ERRORLEVEL=

 if "%OS%" == "Windows_NT" goto WinNT

 

 @REM for 9x/Me you better not have more than 9 args

-python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-2.3.4'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.3.4'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9

+python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-2.3.5'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.3.5'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9

 @REM no way to set exit status of this script for 9x/Me

 goto endscons

 

diff --git a/script/sconsign b/script/sconsign
index b2cf895..197996d 100644
--- a/script/sconsign
+++ b/script/sconsign
@@ -2,7 +2,7 @@
 #
 # SCons - a Software Constructor
 #
-# 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
@@ -23,17 +23,17 @@
 # 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/script/sconsign.py  2014/09/27 12:51:43 garyo"
+__revision__ = "src/script/sconsign.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
 
-__version__ = "2.3.4"
+__version__ = "2.3.5"
 
 __build__ = ""
 
-__buildsys__ = "lubuntu"
+__buildsys__ = "ubuntu1404-32bit"
 
-__date__ = "2014/09/27 12:51:43"
+__date__ = "2015/06/18 06:53:27"
 
-__developer__ = "garyo"
+__developer__ = "bdbaddog"
 
 import os
 import sys