summaryrefslogtreecommitdiffstats
path: root/webkit/build/JavaScriptCore
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-09 01:24:27 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-09 01:24:27 +0000
commitc702f03c0d09b937aaa6958ac4f5ff4bb33cf335 (patch)
treee63f2742f4aefce956d4dbcf1334b60cb281fb45 /webkit/build/JavaScriptCore
parent309d3a2b575538181ce48091794324b8a97fdc77 (diff)
downloadchromium_src-c702f03c0d09b937aaa6958ac4f5ff4bb33cf335.zip
chromium_src-c702f03c0d09b937aaa6958ac4f5ff4bb33cf335.tar.gz
chromium_src-c702f03c0d09b937aaa6958ac4f5ff4bb33cf335.tar.bz2
WebKit merge 40668:40722 part 2.
Review URL: http://codereview.chromium.org/20151 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9380 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/JavaScriptCore')
-rw-r--r--webkit/build/JavaScriptCore/WTF.vcproj12
1 files changed, 12 insertions, 0 deletions
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index b669304..9bed692 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -346,6 +346,10 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\TypeTraits.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\TypeTraits.h"
>
</File>
@@ -381,6 +385,14 @@
RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\VectorTraits.h"
>
</File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\chromium\ChromiumThreading.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\chromium\MainThreadChromium.cpp"
+ >
+ </File>
</Files>
<Globals>
</Globals>