From 4576aa36e9a9671459299c7963ac95aa94beaea9 Mon Sep 17 00:00:00 2001
From: "Shimeng (Simon) Wang" <swang@google.com>
Date: Tue, 7 Dec 2010 17:22:45 -0800
Subject: Merge WebKit at r73109: Initial merge by git.

Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
---
 WebCore/loader/cache/CachePolicy.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'WebCore/loader/cache/CachePolicy.h')

diff --git a/WebCore/loader/cache/CachePolicy.h b/WebCore/loader/cache/CachePolicy.h
index 2639caa..0b9010b 100644
--- a/WebCore/loader/cache/CachePolicy.h
+++ b/WebCore/loader/cache/CachePolicy.h
@@ -33,7 +33,7 @@ namespace WebCore {
         CachePolicyVerify,
         CachePolicyRevalidate,
         CachePolicyReload,
-        CachePolicyAllowStale
+        CachePolicyHistoryBuffer
     };
 
 }
-- 
cgit v1.1