From 7b7246f2ead57160603cf28638701559a270206e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 18 Oct 2003 01:08:27 +0000 Subject: [PATCH] some trivial merges svn path=/trunk/kdelibs/; revision=259797 --- khtml/dom/css_rule.cpp | 1 - khtml/dom/css_rule.h | 1 - khtml/dom/css_stylesheet.cpp | 5 +++-- khtml/dom/dom2_events.h | 4 ++-- khtml/dom/dom2_range.h | 1 - khtml/dom/dom_doc.cpp | 1 - khtml/dom/dom_text.h | 1 - khtml/dom/dom_xml.h | 1 - khtml/dom/html_document.cpp | 1 - khtml/dom/html_form.cpp | 1 - khtml/dom/html_object.cpp | 1 - khtml/dom/html_object.h | 1 - khtml/dom/html_table.cpp | 1 - 13 files changed, 5 insertions(+), 15 deletions(-) diff --git a/khtml/dom/css_rule.cpp b/khtml/dom/css_rule.cpp index 705311cf5c..bab20cc89c 100644 --- a/khtml/dom/css_rule.cpp +++ b/khtml/dom/css_rule.cpp @@ -18,7 +18,6 @@ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * $Id$ */ #include "css/css_ruleimpl.h" diff --git a/khtml/dom/css_rule.h b/khtml/dom/css_rule.h index aef8911766..18656aead6 100644 --- a/khtml/dom/css_rule.h +++ b/khtml/dom/css_rule.h @@ -23,7 +23,6 @@ * http://www.w3.org/TR/2000/CR-DOM-Level-2-20000510/ * Copyright © 2000 W3C® (MIT, INRIA, Keio), All Rights Reserved. * - * $Id$ */ #ifndef _CSS_css_rule_h_ #define _CSS_css_rule_h_ diff --git a/khtml/dom/css_stylesheet.cpp b/khtml/dom/css_stylesheet.cpp index b07ab69d04..ec52fbd960 100644 --- a/khtml/dom/css_stylesheet.cpp +++ b/khtml/dom/css_stylesheet.cpp @@ -1,8 +1,9 @@ /** * This file is part of the DOM implementation for KDE. * - * (C) 1999-2003 Lars Knoll (knoll@kde.org) - * (C) 2001-2003 Dirk Mueller (mueller@kde.org) + * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org) + * (C) 2001-2003 Dirk Mueller (mueller@kde.org) + * (C) 2003 Apple Compputer, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/khtml/dom/dom2_events.h b/khtml/dom/dom2_events.h index 76fe213caf..95c0c2184f 100644 --- a/khtml/dom/dom2_events.h +++ b/khtml/dom/dom2_events.h @@ -1,7 +1,8 @@ /* * This file is part of the DOM implementation for KDE. * - * (C) 2001 Peter Kelly (pmk@post.com) + * Copyright (C) 2001 Peter Kelly (pmk@post.com) + * (C) 2003 Apple Computer, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,7 +19,6 @@ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * $Id$ */ #ifndef _DOM_Events_h_ diff --git a/khtml/dom/dom2_range.h b/khtml/dom/dom2_range.h index 0b4bd773b4..b0881489c2 100644 --- a/khtml/dom/dom2_range.h +++ b/khtml/dom/dom2_range.h @@ -26,7 +26,6 @@ * http://www.w3.org/TR/2000/CR-DOM-Level-2-20000510/ * Copyright © 2000 W3C® (MIT, INRIA, Keio), All Rights Reserved. * - * $Id$ */ #ifndef _dom2_range_h_ #define _dom2_range_h_ diff --git a/khtml/dom/dom_doc.cpp b/khtml/dom/dom_doc.cpp index d0bcfde074..b1e030867a 100644 --- a/khtml/dom/dom_doc.cpp +++ b/khtml/dom/dom_doc.cpp @@ -18,7 +18,6 @@ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * $Id$ */ #include "dom/dom_exception.h" diff --git a/khtml/dom/dom_text.h b/khtml/dom/dom_text.h index f1edc22af5..885b2c8d9f 100644 --- a/khtml/dom/dom_text.h +++ b/khtml/dom/dom_text.h @@ -25,7 +25,6 @@ * Technology , Institut National de Recherche en Informatique et en * Automatique , Keio University ). All Rights Reserved. * - * $Id$ */ #ifndef _DOM_CharacterData_h_ #define _DOM_CharacterData_h_ diff --git a/khtml/dom/dom_xml.h b/khtml/dom/dom_xml.h index 8ec5f5e763..9e3a8e785c 100644 --- a/khtml/dom/dom_xml.h +++ b/khtml/dom/dom_xml.h @@ -25,7 +25,6 @@ * Technology , Institut National de Recherche en Informatique et en * Automatique , Keio University ). All Rights Reserved. * - * $Id$ */ #ifndef _DOM_XML_h #define _DOM_XML_h diff --git a/khtml/dom/html_document.cpp b/khtml/dom/html_document.cpp index cdd3278baa..f7b84df63b 100644 --- a/khtml/dom/html_document.cpp +++ b/khtml/dom/html_document.cpp @@ -18,7 +18,6 @@ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * $Id$ */ // -------------------------------------------------------------------------- diff --git a/khtml/dom/html_form.cpp b/khtml/dom/html_form.cpp index c6fac47876..2327e440fd 100644 --- a/khtml/dom/html_form.cpp +++ b/khtml/dom/html_form.cpp @@ -18,7 +18,6 @@ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * $Id$ */ // -------------------------------------------------------------------------- diff --git a/khtml/dom/html_object.cpp b/khtml/dom/html_object.cpp index 046e89b198..97344386be 100644 --- a/khtml/dom/html_object.cpp +++ b/khtml/dom/html_object.cpp @@ -18,7 +18,6 @@ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * $Id$ */ #include "dom/dom_doc.h" diff --git a/khtml/dom/html_object.h b/khtml/dom/html_object.h index bc1767b36d..17784a96a8 100644 --- a/khtml/dom/html_object.h +++ b/khtml/dom/html_object.h @@ -25,7 +25,6 @@ * Technology , Institut National de Recherche en Informatique et en * Automatique , Keio University ). All Rights Reserved. * - * $Id$ */ // -------------------------------------------------------------------------- diff --git a/khtml/dom/html_table.cpp b/khtml/dom/html_table.cpp index f92f17a840..b4d241ebd7 100644 --- a/khtml/dom/html_table.cpp +++ b/khtml/dom/html_table.cpp @@ -18,7 +18,6 @@ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * $Id$ */ // -------------------------------------------------------------------------- -- GitLab