summaryrefslogtreecommitdiff
path: root/QMTest/TestSCons.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-02 11:55:56 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-02 11:55:56 +0200
commit374b1f7583ad25bca0b801dd046ce8bfebd53bb0 (patch)
tree68cb00322f3bb815eb14c711f71eae2ff52e9ba0 /QMTest/TestSCons.py
parent7d409cbdf931289f934901eddd380e9e91734a54 (diff)
parent4112d19049e27162c333bac13d908f48a4cc438a (diff)
merge brocken gbp import-orig
Diffstat (limited to 'QMTest/TestSCons.py')
-rw-r--r--QMTest/TestSCons.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index a786ec7..fb6e7b0 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -15,7 +15,7 @@ attributes defined in this subclass.
# Copyright (c) 2001 - 2015 The SCons Foundation
from __future__ import division
-__revision__ = "QMTest/TestSCons.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
+__revision__ = "QMTest/TestSCons.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
import os
import re
@@ -34,7 +34,7 @@ from TestCmd import PIPE
# here provides some independent verification that what we packaged
# conforms to what we expect.
-default_version = '2.3.5'
+default_version = '2.3.6'
python_version_unsupported = (2, 3, 0)
python_version_deprecated = (2, 7, 0)
@@ -43,7 +43,7 @@ python_version_deprecated = (2, 7, 0)
# line must remain "__ VERSION __" (without the spaces) so the built
# version in build/QMTest/TestSCons.py contains the actual version
# string of the packages that have been built.
-SConsVersion = '2.3.5'
+SConsVersion = '2.3.6'
if SConsVersion == '__' + 'VERSION' + '__':
SConsVersion = default_version