[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 cf34d791bbf1ec4344d066a2cbf5f7689e5a9a3c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 30 19:25:47 2003 +0000

            * khtml/html/html_documentimpl.cpp: Updated license.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3507 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index cee0e25..a9563c2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,7 @@
+2003-01-30  Darin Adler  <darin at apple.com>
+
+        * khtml/html/html_documentimpl.cpp: Updated license.
+
 2003-01-29  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
@@ -107,7 +111,7 @@
 
         Reviewed by Ken.
 
-	- 3158477 -- text break locator leak leads to giant (2.04 GB) VSIZE idling at livepage
+	- fixed 3158477 -- text break locator leak leads to giant (2.04 GB) VSIZE idling at livepage
 
         * khtml/rendering/break_lines.cpp: (isBreakable): Dispose the text locator.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index cee0e25..a9563c2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,7 @@
+2003-01-30  Darin Adler  <darin at apple.com>
+
+        * khtml/html/html_documentimpl.cpp: Updated license.
+
 2003-01-29  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
@@ -107,7 +111,7 @@
 
         Reviewed by Ken.
 
-	- 3158477 -- text break locator leak leads to giant (2.04 GB) VSIZE idling at livepage
+	- fixed 3158477 -- text break locator leak leads to giant (2.04 GB) VSIZE idling at livepage
 
         * khtml/rendering/break_lines.cpp: (isBreakable): Dispose the text locator.
 
diff --git a/WebCore/khtml/html/html_documentimpl.cpp b/WebCore/khtml/html/html_documentimpl.cpp
index e1fb209..712f0eb 100644
--- a/WebCore/khtml/html/html_documentimpl.cpp
+++ b/WebCore/khtml/html/html_documentimpl.cpp
@@ -20,6 +20,36 @@
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
+ * Portions are Copyright (C) 2002 Netscape Communications Corporation.
+ * Other contributors: David Baron <dbaron at fas.harvard.edu>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Alternatively, the document type parsing portions of this file may be used
+ * under the terms of either the Mozilla Public License Version 1.1, found at
+ * http://www.mozilla.org/MPL/ (the "MPL") or the GNU General Public
+ * License Version 2.0, found at http://www.fsf.org/copyleft/gpl.html
+ * (the "GPL"), in which case the provisions of the MPL or the GPL are
+ * applicable instead of those above.  If you wish to allow use of your
+ * version of this file only under the terms of one of those two
+ * licenses (the MPL or the GPL) and not to allow others to use your
+ * version of this file under the LGPL, indicate your decision by
+ * deleting the provisions above and replace them with the notice and
+ * other provisions required by the MPL or the GPL, as the case may be.
+ * If you do not delete the provisions above, a recipient may use your
+ * version of this file under any of the LGPL, the MPL or the GPL.
  */
 
 #include "html/html_documentimpl.h"

-- 
WebKit Debian packaging