[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit b5891db3df967d64cb8f329d8755544afacc82e0
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 16 10:39:25 2002 +0000

    	Fix for 3128728.  Ensure that list markers get placed into an
    	existing line box if possible.  This patch also fixes RTL bullets
    	and line height calculations involving image bullets that are the
    	biggest thing on the line.  List markers also correctly move
    	to avoid floats.
    
            Reviewed by mjs
    
            * khtml/rendering/render_list.cpp:
            (RenderListItem::setStyle):
            (getLineBoxParent):
            (RenderListItem::layout):
            (RenderListMarker::calcMinMaxWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3083 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6d9a23f..89a415d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -34,7 +34,6 @@
 
         * WebCore.pbproj/project.pbxproj: Updated source version to 37u2.
 
->>>>>>> 1.1131
 2002-12-15  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6d9a23f..89a415d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -34,7 +34,6 @@
 
         * WebCore.pbproj/project.pbxproj: Updated source version to 37u2.
 
->>>>>>> 1.1131
 2002-12-15  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.

-- 
WebKit Debian packaging