[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 1b575ffa1e0f88613824306adf3dafd57ee05b9c
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 30 00:29:27 2003 +0000

    	Fix for auto width tables.  Prevent overflow when assigning from
    	the computed integer max width back into a short value.
    
    	Fixes cnn.com and spies.com. Bug # is 3158469.
    
            Reviewed by darin
    
            * khtml/rendering/table_layout.cpp:
            (AutoTableLayout::calcMinMaxWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3501 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6e23ac2..ed7e4cf 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -231,7 +231,6 @@
         (KWQKHTMLPart::doFakeMouseUpAfterWidgetTracking):  New routine to allow widgets
 	to get out event state fixed up after a modal tracking loop.
 
->>>>>>> 1.1331
 2003-01-27  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3152053 - Safari: Java 141: Only visible applets are instantiated on web page
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6e23ac2..ed7e4cf 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -231,7 +231,6 @@
         (KWQKHTMLPart::doFakeMouseUpAfterWidgetTracking):  New routine to allow widgets
 	to get out event state fixed up after a modal tracking loop.
 
->>>>>>> 1.1331
 2003-01-27  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3152053 - Safari: Java 141: Only visible applets are instantiated on web page

-- 
WebKit Debian packaging