[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 4996a25ae71553fd83ae78e8636998ad83edbb5e
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 07:48:53 2010 +0000

    2010-01-21  Adam Barth  <abarth at webkit.org>
    
            Unreviewed.  Added a blank line requested by the great an powerful
            fishd.
    
            * public/WebFrameClient.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53683 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index e16c7cc..d3e6b15 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,12 @@
 2010-01-21  Adam Barth  <abarth at webkit.org>
 
+        Unreviewed.  Added a blank line requested by the great an powerful
+        fishd.
+
+        * public/WebFrameClient.h:
+
+2010-01-21  Adam Barth  <abarth at webkit.org>
+
         Reviewed by Eric Seidel.
 
         [chromium] Add allowPlugins callback to allow per-site enabling of plugins
diff --git a/WebKit/chromium/public/WebFrameClient.h b/WebKit/chromium/public/WebFrameClient.h
index e74113a..5c12a57 100644
--- a/WebKit/chromium/public/WebFrameClient.h
+++ b/WebKit/chromium/public/WebFrameClient.h
@@ -83,6 +83,7 @@ public:
     // Controls whether plugins are allowed for this frame.
     virtual bool allowPlugins(WebFrame*, bool enabledPerSettings) { return enabledPerSettings; }
 
+
     // Load commands -------------------------------------------------------
 
     // The client should handle the navigation externally.

-- 
WebKit Debian packaging