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/WebKit/win/WebJavaScriptCollector.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'Source/WebKit/win/WebJavaScriptCollector.cpp')

diff --git a/Source/WebKit/win/WebJavaScriptCollector.cpp b/Source/WebKit/win/WebJavaScriptCollector.cpp
index 42a9da1..cb56b27 100644
--- a/Source/WebKit/win/WebJavaScriptCollector.cpp
+++ b/Source/WebKit/win/WebJavaScriptCollector.cpp
@@ -27,13 +27,11 @@
 #include "WebKitDLL.h"
 #include "WebJavaScriptCollector.h"
 
-#pragma warning(push, 0)
 #include <JavaScriptCore/Heap.h>
 #include <JavaScriptCore/JSGlobalData.h>
 #include <WebCore/GCController.h>
 #include <WebCore/JSDOMWindow.h>
 #include <runtime/JSLock.h>
-#pragma warning(pop)
 
 using namespace JSC;
 using namespace WebCore;
-- 
cgit v1.1