summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Node/FS.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/SCons/Node/FS.py')
-rw-r--r--src/engine/SCons/Node/FS.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 0978b57..923615f 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -89,7 +89,7 @@ def LinkFunc(target, source, env):
Link = SCons.Action.Action(LinkFunc, None)
-def LocalString(target, source):
+def LocalString(target, source, env):
return 'Local copy of %s from %s' % (target[0], source[0])
LocalCopy = SCons.Action.Action(LinkFunc, LocalString)
g of both undo- and redo-stacks.Erik Verbruggen2010-02-111-3/+2 | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-111-0/+14 |\ \ \ | | |/ | |/| | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added \since 4.7 tags | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-02-1111-298/+475 | |\ \ | |/ / |/| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-1119-129/+473 |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added geometry shaders to changes-4.7.0 file + a small doc update about it Crash when deleting the parent of a context menu while it is being displayed Workaround for a certain functionally challenged compiler Fix failing QDoubleValidator tests Use libpng API as recommended. Preparation for upgrade to libpng 1.4.0. QMainWindow: update the separator size when the style change Another round of Geometry shader review. Fix Geometry shaders based on review Geometry Shader support in QGLShaderProgram * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1011-298/+475 |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant: Remove assertion for all files being watched. Fixed regression. Added method to clear the undo/redo stacks. Fixed setting back spaces when streaming a QPointF Move find widget in it's own source file. Some further cleanup. | * | | Assistant: Remove assertion for all files being watched.ck2010-02-101-9/+13 | | | | | | | | | | | | | | | | For unknown reasons, the assumption does not hold at times. | * | | Fixed regression.Erik Verbruggen2010-02-101-4/+4 | | | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1010-289/+462 | |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Added method to clear the undo/redo stacks. Fixed setting back spaces when streaming a QPointF Move find widget in it's own source file. Some further cleanup. | * | | Added method to clear the undo/redo stacks.Erik Verbruggen2010-02-094-22/+67 | | | | | | | | | | | | | | | | Reviewed-by: mae | * | | Fixed setting back spaces when streaming a QPointFThorbjørn Lindeijer2010-02-091-1/+1 | | | | | | | | | | | | | | | | | | | | When streaming a QPointF, it did not restore the inserting of spaces like the QPoint does. | * | | Move find widget in it's own source file. Some further cleanup.kh12010-02-095-266/+394 | | | | | | | | | | | | | | | | Reviewed-by: ck | | | * Added \since 4.7 tagsGunnar Sletta2010-02-101-0/+14 | | |/ | | * Added geometry shaders to changes-4.7.0 file + a small doc update about itGunnar Sletta2010-02-102-0/+5 | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-02-10227-7592/+5821 | | |\ | | | * Crash when deleting the parent of a context menu while it is being displayedGabriel de Dietrich2010-02-10