diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-11-16 05:58:16 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-11-16 05:58:16 +0100 |
commit | 60df8165e6be58369d76af4d38388c9846d82975 (patch) | |
tree | 827a72e604ad686e6817a40ff0dcaef405212276 /engine/SCons/Environment.py | |
parent | 9948951ec4fcd3c29d7d7ba981de1d1fea275595 (diff) | |
parent | 6a570afd28bccdb118edde36488ba9834494d6c7 (diff) |
Merge tag 'upstream/2.4.1'
Upstream version 2.4.1
Diffstat (limited to 'engine/SCons/Environment.py')
-rw-r--r-- | engine/SCons/Environment.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/SCons/Environment.py b/engine/SCons/Environment.py index 865c821..b779302 100644 --- a/engine/SCons/Environment.py +++ b/engine/SCons/Environment.py @@ -31,7 +31,7 @@ Environment # 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/engine/SCons/Environment.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog" +__revision__ = "src/engine/SCons/Environment.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog" import copy @@ -612,7 +612,7 @@ class SubstitutionEnvironment(object): def Override(self, overrides): """ - Produce a modified environment whose variables are overriden by + Produce a modified environment whose variables are overridden by the overrides dictionaries. "overrides" is a dictionary that will override the variables of this environment. |