[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/khtml/dom
From:       Dirk Mueller <mueller () kde ! org>
Date:       2003-10-18 1:08:28
[Download RAW message or body]

CVS commit by mueller: 

some trivial merges


  M +0 -1      css_rule.cpp   1.13
  M +0 -1      css_rule.h   1.15
  M +3 -2      css_stylesheet.cpp   1.20
  M +2 -2      dom2_events.h   1.14
  M +0 -1      dom2_range.h   1.23
  M +0 -1      dom_doc.cpp   1.52
  M +0 -1      dom_text.h   1.15
  M +0 -1      dom_xml.h   1.14
  M +0 -1      html_document.cpp   1.39
  M +0 -1      html_form.cpp   1.41
  M +0 -1      html_object.cpp   1.15
  M +0 -1      html_object.h   1.15
  M +0 -1      html_table.cpp   1.19


--- kdelibs/khtml/dom/css_rule.cpp  #1.12:1.13
@@ -19,5 +19,4 @@
  * Boston, MA 02111-1307, USA.
  *
- * $Id$
  */
 

--- kdelibs/khtml/dom/css_rule.h  #1.14:1.15
@@ -24,5 +24,4 @@
  * Copyright © 2000 W3C® (MIT, INRIA, Keio), All Rights Reserved.
  *
- * $Id$
  */
 #ifndef _CSS_css_rule_h_

--- kdelibs/khtml/dom/css_stylesheet.cpp  #1.19:1.20
@@ -2,6 +2,7 @@
  * 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

--- kdelibs/khtml/dom/dom2_events.h  #1.13:1.14
@@ -2,5 +2,6 @@
  * 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
@@ -19,5 +20,4 @@
  * Boston, MA 02111-1307, USA.
  *
- * $Id$
  */
 

--- kdelibs/khtml/dom/dom2_range.h  #1.22:1.23
@@ -27,5 +27,4 @@
  * Copyright © 2000 W3C® (MIT, INRIA, Keio), All Rights Reserved.
  *
- * $Id$
  */
 #ifndef _dom2_range_h_

--- kdelibs/khtml/dom/dom_doc.cpp  #1.51:1.52
@@ -19,5 +19,4 @@
  * Boston, MA 02111-1307, USA.
  *
- * $Id$
  */
 

--- kdelibs/khtml/dom/dom_text.h  #1.14:1.15
@@ -26,5 +26,4 @@
  * Automatique , Keio University ). All Rights Reserved.
  *
- * $Id$
  */
 #ifndef _DOM_CharacterData_h_

--- kdelibs/khtml/dom/dom_xml.h  #1.13:1.14
@@ -26,5 +26,4 @@
  * Automatique , Keio University ). All Rights Reserved.
  *
- * $Id$
  */
 #ifndef _DOM_XML_h

--- kdelibs/khtml/dom/html_document.cpp  #1.38:1.39
@@ -19,5 +19,4 @@
  * Boston, MA 02111-1307, USA.
  *
- * $Id$
  */
 // --------------------------------------------------------------------------

--- kdelibs/khtml/dom/html_form.cpp  #1.40:1.41
@@ -19,5 +19,4 @@
  * Boston, MA 02111-1307, USA.
  *
- * $Id$
  */
 // --------------------------------------------------------------------------

--- kdelibs/khtml/dom/html_object.cpp  #1.14:1.15
@@ -19,5 +19,4 @@
  * Boston, MA 02111-1307, USA.
  *
- * $Id$
  */
 

--- kdelibs/khtml/dom/html_object.h  #1.14:1.15
@@ -26,5 +26,4 @@
  * Automatique , Keio University ). All Rights Reserved.
  *
- * $Id$
  */
 

--- kdelibs/khtml/dom/html_table.cpp  #1.18:1.19
@@ -19,5 +19,4 @@
  * Boston, MA 02111-1307, USA.
  *
- * $Id$
  */
 // --------------------------------------------------------------------------


[prev in list] [next in list] [prev in thread] [next in thread]