Merge branch 'feature/upstrem' into develop

5 files changed, 18 insertions, 18 deletions

diff --git a/script/scons b/script/scons
index 98f4e62..1d9595e 100755
--- a/script/scons
+++ b/script/scons
@@ -25,15 +25,15 @@
 
 from __future__ import print_function
 
-__revision__ = "src/script/scons.py ae4de9ab2249be220b6658a514eef8c3a57afc04 2019-07-21 02:32:15 bdeegan"
+__revision__ = "src/script/scons.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
 
-__version__ = "3.1.0"
+__version__ = "3.1.1"
 
-__build__ = "ae4de9ab2249be220b6658a514eef8c3a57afc04"
+__build__ = "72ae09dc35ac2626f8ff711d8c4b30b6138e08e3"
 
-__buildsys__ = "kufra"
+__buildsys__ = "octodog"
 
-__date__ = "2019-07-21 02:32:15"
+__date__ = "2019-08-08 14:50:06"
 
 __developer__ = "bdeegan"
 
diff --git a/script/scons-configure-cache b/script/scons-configure-cache
index 757a79f..8bce553 100644
--- a/script/scons-configure-cache
+++ b/script/scons-configure-cache
@@ -37,15 +37,15 @@ import glob
 import json
 import os
 
-__revision__ = "src/script/scons-configure-cache.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan"
+__revision__ = "src/script/scons-configure-cache.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
 
-__version__ = "3.1.0"
+__version__ = "3.1.1"
 
-__build__ = "e724ae812eb96f4858a132f5b8c769724744faf6"
+__build__ = "72ae09dc35ac2626f8ff711d8c4b30b6138e08e3"
 
-__buildsys__ = "kufra"
+__buildsys__ = "octodog"
 
-__date__ = "2019-07-21 00:04:47"
+__date__ = "2019-08-08 14:50:06"
 
 __developer__ = "bdeegan"
 
diff --git a/script/scons-time b/script/scons-time
index 975ff64..15e3700 100644
--- a/script/scons-time
+++ b/script/scons-time
@@ -31,7 +31,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 from __future__ import division, print_function
 
-__revision__ = "src/script/scons-time.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan"
+__revision__ = "src/script/scons-time.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
 
 import getopt
 import glob
diff --git a/script/scons.bat b/script/scons.bat
index 75e2a49..a5b1b6e 100644
--- a/script/scons.bat
+++ b/script/scons.bat
@@ -1,11 +1,11 @@
 @REM Copyright (c) 2001 - 2019 The SCons Foundation

-@REM src/script/scons.bat e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan

+@REM src/script/scons.bat 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan

 @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-3.1.0'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-3.1.0'), 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-3.1.1'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-3.1.1'), 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 3e8d4cf..7c5dda5 100644
--- a/script/sconsign
+++ b/script/sconsign
@@ -25,15 +25,15 @@
 
 from __future__ import print_function
 
-__revision__ = "src/script/sconsign.py ae4de9ab2249be220b6658a514eef8c3a57afc04 2019-07-21 02:32:15 bdeegan"
+__revision__ = "src/script/sconsign.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
 
-__version__ = "3.1.0"
+__version__ = "3.1.1"
 
-__build__ = "ae4de9ab2249be220b6658a514eef8c3a57afc04"
+__build__ = "72ae09dc35ac2626f8ff711d8c4b30b6138e08e3"
 
-__buildsys__ = "kufra"
+__buildsys__ = "octodog"
 
-__date__ = "2019-07-21 02:32:15"
+__date__ = "2019-08-08 14:50:06"
 
 __developer__ = "bdeegan"