[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 3ec84e7c362b68ed1751ff4e7785ca2ef9a958b2
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 15 09:44:19 2010 +0000

    2010-09-15  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: Multiline console does not work on Windows / Linux.
            https://bugs.webkit.org/show_bug.cgi?id=45807
    
            * inspector/front-end/ConsoleView.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67545 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3bc564d..033ace7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-15  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Multiline console does not work on Windows / Linux.
+        https://bugs.webkit.org/show_bug.cgi?id=45807
+
+        * inspector/front-end/ConsoleView.js:
+
 2010-09-15  Renata Hodovan  <reni at inf.u-szeged.hu>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/inspector/front-end/ConsoleView.js b/WebCore/inspector/front-end/ConsoleView.js
index 9785cd0..dfb1e26 100644
--- a/WebCore/inspector/front-end/ConsoleView.js
+++ b/WebCore/inspector/front-end/ConsoleView.js
@@ -518,7 +518,7 @@ WebInspector.ConsoleView.prototype = {
 
     _enterKeyPressed: function(event)
     {
-        if (event.altKey)
+        if (event.altKey || event.ctrlKey)
             return;
 
         event.preventDefault();

-- 
WebKit Debian packaging