diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /JavaScriptCore/JavaScriptCore.vcproj/WTF | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'JavaScriptCore/JavaScriptCore.vcproj/WTF')
| -rw-r--r-- | JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj index 0145311..d094643 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj +++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj @@ -239,6 +239,10 @@ RelativePath="..\..\wtf\win\MainThreadWin.cpp"
>
</File>
+ <File
+ RelativePath="..\..\wtf\win\OwnPtrWin.cpp"
+ >
+ </File>
</Filter>
<File
RelativePath="..\..\wtf\AlwaysInline.h"
@@ -257,6 +261,10 @@ >
</File>
<File
+ RelativePath="..\..\wtf\Atomics.h"
+ >
+ </File>
+ <File
RelativePath="..\..\wtf\ByteArray.cpp"
>
</File>
@@ -373,6 +381,14 @@ >
</File>
<File
+ RelativePath="..\..\wtf\MD5.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\wtf\MD5.h"
+ >
+ </File>
+ <File
RelativePath="..\..\wtf\MainThread.cpp"
>
</File>
@@ -413,10 +429,6 @@ >
</File>
<File
- RelativePath="..\..\wtf\OwnPtrWin.cpp"
- >
- </File>
- <File
RelativePath="..\..\wtf\PassOwnPtr.h"
>
</File>
@@ -505,10 +517,18 @@ >
</File>
<File
+ RelativePath="..\..\wtf\ThreadingPrimitives.h"
+ >
+ </File>
+ <File
RelativePath="..\..\wtf\ThreadingWin.cpp"
>
</File>
<File
+ RelativePath="..\..\wtf\ThreadSafeShared.h"
+ >
+ </File>
+ <File
RelativePath="..\..\wtf\ThreadSpecific.h"
>
</File>
|