diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2012-08-20 23:14:14 +0200 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2012-08-20 23:14:14 +0200 |
| commit | 8e4021080603581eb79c62453b8c4686f5dcf252 (patch) | |
| tree | b9d9941e87efc666f0cdb1b09bc759323df17e5f /engine/SCons/Tool/nasm.py | |
| parent | e3e69e56dd121d112255763c3173494abe4a7390 (diff) | |
| parent | de88ed62712f996f44628e2e83af1026181175d8 (diff) | |
Merge tag 'upstream/2.2.0'
Upstream version 2.2.0
Diffstat (limited to 'engine/SCons/Tool/nasm.py')
| -rw-r--r-- | engine/SCons/Tool/nasm.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/SCons/Tool/nasm.py b/engine/SCons/Tool/nasm.py index 5641518..e76b51a 100644 --- a/engine/SCons/Tool/nasm.py +++ b/engine/SCons/Tool/nasm.py @@ -9,7 +9,7 @@ selection method. """ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/nasm.py 5357 2011/09/09 21:31:03 bdeegan" +__revision__ = "src/engine/SCons/Tool/nasm.py issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo" import SCons.Defaults import SCons.Tool |