summaryrefslogtreecommitdiffstats
path: root/webkit/build/WebCore
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-14 21:51:52 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-14 21:51:52 +0000
commit4c39d240d8b9541e8d90b8c2595a8e896464e0a1 (patch)
treecbb8f22875ccef034d1a64337363328c157fb94c /webkit/build/WebCore
parent206e0c0d55efe6a389793c071c05eeea70a87047 (diff)
downloadchromium_src-4c39d240d8b9541e8d90b8c2595a8e896464e0a1.zip
chromium_src-4c39d240d8b9541e8d90b8c2595a8e896464e0a1.tar.gz
chromium_src-4c39d240d8b9541e8d90b8c2595a8e896464e0a1.tar.bz2
Get rid of pending\webkit\DeleteButtonController.cpp
from the SCons build. Delete left-over $PENDING_DIR in commented-out file. Review URL: http://codereview.chromium.org/7322 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/WebCore')
-rw-r--r--webkit/build/WebCore/SConscript4
1 files changed, 1 insertions, 3 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 7728ca5..d0576a2 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -170,9 +170,7 @@ input_files = [
'$WEBCORE_DIR/editing/CompositeEditCommand.cpp',
'$WEBCORE_DIR/editing/CreateLinkCommand.cpp',
'$WEBCORE_DIR/editing/DeleteButton.cpp',
- # Uncomment and replace following line when the $PENDING_DIR file unforks.
- #'$WEBCORE_DIR/editing/DeleteButtonController.cpp',
- '$PENDING_DIR/DeleteButtonController.cpp',
+ '$WEBCORE_DIR/editing/DeleteButtonController.cpp',
'$WEBCORE_DIR/editing/DeleteFromTextNodeCommand.cpp',
'$WEBCORE_DIR/editing/DeleteSelectionCommand.cpp',
'$WEBCORE_DIR/editing/EditCommand.cpp',