summaryrefslogtreecommitdiffstats
path: root/webkit/build/WebCore
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-07 22:03:04 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-07 22:03:04 +0000
commit2980234571ab83756a11ed71497d1132687aaf88 (patch)
tree88115f2cbb94ceed1299a3b1a73b18085e4432b8 /webkit/build/WebCore
parentc30cf1ab3662fbe9c5ed23f5e575061cf68591ae (diff)
downloadchromium_src-2980234571ab83756a11ed71497d1132687aaf88.zip
chromium_src-2980234571ab83756a11ed71497d1132687aaf88.tar.gz
chromium_src-2980234571ab83756a11ed71497d1132687aaf88.tar.bz2
Revert r2927 and r2930, which were themselves reversions of prior changelists.
(Misc. build fixes for KJS build and remnants of unforking a couple of files.) Review URL: http://codereview.chromium.org/6321 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/WebCore')
-rw-r--r--webkit/build/WebCore/WebCore.vcproj8
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 0ad44a9..74b102d 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -3374,11 +3374,11 @@
>
</File>
<File
- RelativePath="..\..\pending\Node.cpp"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\Node.cpp"
>
</File>
<File
- RelativePath="..\..\pending\Node.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\Node.h"
>
</File>
<File
@@ -4546,11 +4546,11 @@
>
</File>
<File
- RelativePath="..\..\pending\HTMLPlugInElement.cpp"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\html\HTMLPlugInElement.cpp"
>
</File>
<File
- RelativePath="..\..\pending\HTMLPlugInElement.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\html\HTMLPlugInElement.h"
>
</File>
<File