summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/Scripts/generate-js-builtins.py
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2014-11-03 10:45:00 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2014-11-03 11:27:48 +0100
commit01c392c4582a37469195c054e5026e93e3e3551d (patch)
treef0d7649c8da39cf97d709a53046b9f329f7446fc /Source/JavaScriptCore/Scripts/generate-js-builtins.py
parent94711f7406fa8bd71728a1cc912870489f8c5447 (diff)
downloadqtwebkit-01c392c4582a37469195c054e5026e93e3e3551d.tar.gz
Fix merge error
The change 4a39158368f6184c8d56e1d65866ba99f83297e0 merged a part of the diff for prepend to append. This patch moves the wrongly merged line. Task-number: QTBUG-40284 Change-Id: I32d1b2f8e730aca38964d3675d3dec94512e0026 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/Scripts/generate-js-builtins.py')
0 files changed, 0 insertions, 0 deletions