some trivial merges

svn path=/trunk/kdelibs/; revision=259797

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"

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_

khtml/dom/css_stylesheet.cpp

 /**
  * This file is part of the DOM implementation for KDE.
  *
- * (C) 1999-2003 Lars Knoll (knoll@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

khtml/dom/dom2_events.h

 /*
  * 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_

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_

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"

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_

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

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$
  */
 // --------------------------------------------------------------------------
 

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$
  */
 // --------------------------------------------------------------------------
 

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"

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$
  */
 
 // --------------------------------------------------------------------------

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$
  */
 // --------------------------------------------------------------------------