From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 25 May 2011 19:08:45 +0100
Subject: Merge WebKit at r82507: Initial merge by git

Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
---
 Source/JavaScriptGlue/ForwardingHeaders/wtf/ThreadSafeRefCounted.h | 1 +
 Source/JavaScriptGlue/ForwardingHeaders/wtf/ThreadSafeShared.h     | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 Source/JavaScriptGlue/ForwardingHeaders/wtf/ThreadSafeRefCounted.h
 delete mode 100644 Source/JavaScriptGlue/ForwardingHeaders/wtf/ThreadSafeShared.h

(limited to 'Source/JavaScriptGlue/ForwardingHeaders/wtf')

diff --git a/Source/JavaScriptGlue/ForwardingHeaders/wtf/ThreadSafeRefCounted.h b/Source/JavaScriptGlue/ForwardingHeaders/wtf/ThreadSafeRefCounted.h
new file mode 100644
index 0000000..48a54cc
--- /dev/null
+++ b/Source/JavaScriptGlue/ForwardingHeaders/wtf/ThreadSafeRefCounted.h
@@ -0,0 +1 @@
+#include <JavaScriptCore/ThreadSafeRefCounted.h>
diff --git a/Source/JavaScriptGlue/ForwardingHeaders/wtf/ThreadSafeShared.h b/Source/JavaScriptGlue/ForwardingHeaders/wtf/ThreadSafeShared.h
deleted file mode 100644
index 4a7a77f..0000000
--- a/Source/JavaScriptGlue/ForwardingHeaders/wtf/ThreadSafeShared.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/ThreadSafeShared.h>
-- 
cgit v1.1