diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-29 22:20:34 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-29 22:20:34 +0200 |
| commit | 4afc984101977fdff83c8b3ed7c26fcaf1a0030e (patch) | |
| tree | 58016e3c49b02a7d08effd2258dcf80c8af37350 /QMTest/TestSCons.py | |
| parent | a414d8e46960130a36b0bde5de3bef8cbd769e13 (diff) | |
| parent | a2795b63dd02ecddd8a0109dcc1b64108f68eace (diff) | |
Merge tag 'upstream/2.3.4'
Upstream version 2.3.4
Diffstat (limited to 'QMTest/TestSCons.py')
| -rw-r--r-- | QMTest/TestSCons.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index eac25d1..35ed918 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -15,7 +15,7 @@ attributes defined in this subclass. # Copyright (c) 2001 - 2014 The SCons Foundation from __future__ import division -__revision__ = "QMTest/TestSCons.py 2014/08/24 12:12:31 garyo" +__revision__ = "QMTest/TestSCons.py 2014/09/27 12:51:43 garyo" 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.3' +default_version = '2.3.4' 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.3' +SConsVersion = '2.3.4' if SConsVersion == '__' + 'VERSION' + '__': SConsVersion = default_version |