diff options
| author | Russel Winder <russel@winder.org.uk> | 2016-04-10 09:41:00 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2016-04-10 09:41:00 (GMT) |
| commit | 6a37189174372c9c98c63ada58ab4352adf650e8 (patch) | |
| tree | 521ddb1071569fa90100e11d7f03af13d5689aaf /QMTest | |
| parent | 14924bcc1713c5bd7dcf4db5b420204407048889 (diff) | |
| parent | 3e0a831c7fcd60384266e14641a3a15f2cba1ced (diff) | |
| download | SCons-6a37189174372c9c98c63ada58ab4352adf650e8.zip SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.gz SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.bz2 | |
Commit resolved conflicted merge.
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/TestSCons.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 6820ae1..88d0e9c 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -34,9 +34,9 @@ from TestCmd import PIPE # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '2.4.2.alpha.yyyymmdd' +default_version = '2.5.0' -python_version_unsupported = (2, 3, 0) +python_version_unsupported = (2, 6, 0) python_version_deprecated = (2, 7, 0) # In the checked-in source, the value of SConsVersion in the following |