[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c66ece35d178f60d8171276d7710f64018ed0cdd
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 27 21:32:52 2009 +0000

    Unreviewed fix for WebInspector with Qt build.
    
    Patch by Simon Hausmann <hausmann at webkit.org> on 2009-09-27
    Simply re-generate the Qt resource file by running
    WebKitTools/Scripts/generate-qt-inspector-resource
    
    * inspector/front-end/WebKit.qrc:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48804 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bf38134..940fdab 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-27  Simon Hausmann  <hausmann at webkit.org>
+
+        Unreviewed fix for WebInspector with Qt build.
+
+        Simply re-generate the Qt resource file by running
+        WebKitTools/Scripts/generate-qt-inspector-resource
+
+        * inspector/front-end/WebKit.qrc:
+
 2009-09-27  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by nobody (trivial ChangeLog fix).
diff --git a/WebCore/inspector/front-end/WebKit.qrc b/WebCore/inspector/front-end/WebKit.qrc
index b4dff4e..0c50bb7 100644
--- a/WebCore/inspector/front-end/WebKit.qrc
+++ b/WebCore/inspector/front-end/WebKit.qrc
@@ -92,6 +92,7 @@
     <file>Images/enableSolidButtonGlyph.png</file>
     <file>Images/errorIcon.png</file>
     <file>Images/errorMediumIcon.png</file>
+    <file>Images/errorRedDot.png</file>
     <file>Images/excludeButtonGlyph.png</file>
     <file>Images/focusButtonGlyph.png</file>
     <file>Images/forward.png</file>
@@ -153,6 +154,7 @@
     <file>Images/statusbarResizerHorizontal.png</file>
     <file>Images/statusbarResizerVertical.png</file>
     <file>Images/storageIcon.png</file>
+    <file>Images/successGreenDot.png</file>
     <file>Images/timelineHollowPillBlue.png</file>
     <file>Images/timelineHollowPillGray.png</file>
     <file>Images/timelineHollowPillGreen.png</file>
@@ -184,6 +186,7 @@
     <file>Images/userInputResultIcon.png</file>
     <file>Images/warningIcon.png</file>
     <file>Images/warningMediumIcon.png</file>
+    <file>Images/warningOrangeDot.png</file>
     <file>Images/warningsErrors.png</file>
 </qresource>
 </RCC>

-- 
WebKit Debian packaging