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

[darin]

The following commit has been merged in the debian/unstable branch:
commit fdb1677f3b723244d7567571aedacb72b7cd41c6
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 5 23:54:15 2003 +0000

            Reviewed by Dave.
    
            - fixed 3165682 -- REGRESSION: assertion failure in appendChildNode loading cnn.com
    
            * khtml/rendering/render_table.cpp: (RenderTable::addChild):
            Get rid of double-addChild introduced when I carelessly rolled in a change
            from the KHTML guys.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3577 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b68914a..adfbf68 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-02-05  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed 3165682 -- REGRESSION: assertion failure in appendChildNode loading cnn.com
+
+        * khtml/rendering/render_table.cpp: (RenderTable::addChild):
+        Get rid of double-addChild introduced when I carelessly rolled in a change
+        from the KHTML guys.
+
 2003-02-05  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3164949.  My fix to make form controls actually obey
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b68914a..adfbf68 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-02-05  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed 3165682 -- REGRESSION: assertion failure in appendChildNode loading cnn.com
+
+        * khtml/rendering/render_table.cpp: (RenderTable::addChild):
+        Get rid of double-addChild introduced when I carelessly rolled in a change
+        from the KHTML guys.
+
 2003-02-05  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3164949.  My fix to make form controls actually obey
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index d884bb5..a6277d7 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -143,7 +143,6 @@ void RenderTable::addChild(RenderObject *child, RenderObject *beforeChild)
         break;
     case TABLE_COLUMN:
     case TABLE_COLUMN_GROUP:
-	RenderContainer::addChild(child,beforeChild);
 	has_col_elems = true;
         break;
     case TABLE_HEADER_GROUP:

-- 
WebKit Debian packaging