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/inspector/front-end/Settings.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'WebCore/inspector/front-end/Settings.js')

diff --git a/WebCore/inspector/front-end/Settings.js b/WebCore/inspector/front-end/Settings.js
index 1acc2e0..163b184 100644
--- a/WebCore/inspector/front-end/Settings.js
+++ b/WebCore/inspector/front-end/Settings.js
@@ -47,6 +47,8 @@ var Preferences = {
     resourceExportEnabled: false,
     fileSystemEnabled: false,
     useDataURLForResourceImageIcons: true,
+    showTimingTab: false,
+    showCookiesTab: false,
     debugMode: false
 }
 
-- 
cgit v1.1