[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 b29fb308004b9b185f67bab75886121516b0c1f8
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 24 20:48:59 2003 +0000

    	Fix for 3146066, messed up lists on dictionary.com.  Make
    	sure that a marker in an anonymous box with no other line box
    	parent available just stays where it is, rather than removing
    	itself from the anonymous box (causing that box to be deleted
    	and recreated ad infinitum).
    
            Reviewed by darin
    
            * khtml/rendering/render_list.cpp:
            (RenderListItem::updateMarkerLocation):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3449 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9f306ff..3b9ecc2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -30,7 +30,6 @@
 
         * kwq/WebCoreBridge.h: Added incomingReferrer.
 
->>>>>>> 1.1315
 2003-01-24  Trey Matteson  <trey at apple.com>
 
 	3155162 - cursor changes to I-beam after dragging image	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9f306ff..3b9ecc2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -30,7 +30,6 @@
 
         * kwq/WebCoreBridge.h: Added incomingReferrer.
 
->>>>>>> 1.1315
 2003-01-24  Trey Matteson  <trey at apple.com>
 
 	3155162 - cursor changes to I-beam after dragging image	

-- 
WebKit Debian packaging