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/WebCache.cpp | 3 ---
 1 file changed, 3 deletions(-)

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

diff --git a/Source/WebKit/win/WebCache.cpp b/Source/WebKit/win/WebCache.cpp
index c7d0f31..dab1bcd 100644
--- a/Source/WebKit/win/WebCache.cpp
+++ b/Source/WebKit/win/WebCache.cpp
@@ -28,12 +28,9 @@
 #include "WebCache.h"
 
 #include "CFDictionaryPropertyBag.h"
-
-#pragma warning(push, 0)
 #include <WebCore/ApplicationCacheStorage.h>
 #include <WebCore/MemoryCache.h>
 #include <WebCore/CrossOriginPreflightResultCache.h>
-#pragma warning(pop)
 
 // WebCache ---------------------------------------------------------------------------
 
-- 
cgit v1.1