[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 6d3a6165911ff54de5ea123f8fe46ebafd677b33
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 20:18:04 2010 +0000

    2010-03-02  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed: adding missing image files to WebKit.qrc and gypi.
    
            * WebCore.gypi:
            * inspector/front-end/WebKit.qrc:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ff0d7dc..24d7cf3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-02  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed: adding missing image files to WebKit.qrc and gypi.
+
+        * WebCore.gypi:
+        * inspector/front-end/WebKit.qrc:
+
 2010-03-02  Kim Grönholm  <kim.gronholm at nomovok.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index c4c9210..1910869 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -3811,6 +3811,10 @@
         'webinspector_image_files': [
 
             'inspector/front-end/Images/back.png',
+            'inspector/front-end/Images/breakpointBorder.png',
+            'inspector/front-end/Images/breakpointConditionalBorder.png',
+            'inspector/front-end/Images/breakpointConditionalCounterBorder.png',
+            'inspector/front-end/Images/breakpointCounterBorder.png',
             'inspector/front-end/Images/breakpointsActivateButtonGlyph.png',
             'inspector/front-end/Images/breakpointsDeactivateButtonGlyph.png',
             'inspector/front-end/Images/checker.png',
@@ -3870,6 +3874,7 @@
             'inspector/front-end/Images/profilesIcon.png',
             'inspector/front-end/Images/profileSmallIcon.png',
             'inspector/front-end/Images/profilesSilhouette.png',
+            'inspector/front-end/Images/programCounterBorder.png',
             'inspector/front-end/Images/radioDot.png',
             'inspector/front-end/Images/recordButtonGlyph.png',
             'inspector/front-end/Images/recordToggledButtonGlyph.png',
diff --git a/WebCore/inspector/front-end/WebKit.qrc b/WebCore/inspector/front-end/WebKit.qrc
index 5b3b9ca..ff21c15 100644
--- a/WebCore/inspector/front-end/WebKit.qrc
+++ b/WebCore/inspector/front-end/WebKit.qrc
@@ -95,6 +95,10 @@
     <file>popover.css</file>
     <file>textViewer.css</file>
     <file>Images/back.png</file>
+    <file>Images/breakpointBorder.png</file>
+    <file>Images/breakpointConditionalBorder.png</file>
+    <file>Images/breakpointConditionalCounterBorder.png</file>
+    <file>Images/breakpointCounterBorder.png</file>
     <file>Images/breakpointsActivateButtonGlyph.png</file>
     <file>Images/breakpointsDeactivateButtonGlyph.png</file>
     <file>Images/checker.png</file>
@@ -154,6 +158,7 @@
     <file>Images/profilesIcon.png</file>
     <file>Images/profileSmallIcon.png</file>
     <file>Images/profilesSilhouette.png</file>
+    <file>Images/programCounterBorder.png</file>
     <file>Images/radioDot.png</file>
     <file>Images/recordButtonGlyph.png</file>
     <file>Images/recordToggledButtonGlyph.png</file>

-- 
WebKit Debian packaging