[webkit-changes] cvs commit: WebCore ChangeLog

[Darin]

darin       05/12/06 17:16:33

  Modified:    .        ChangeLog
  Log:
  Removed change marker.
  
  Revision  Changes    Path
  1.484     +0 -3      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.483
  retrieving revision 1.484
  diff -u -r1.483 -r1.484
  --- ChangeLog	7 Dec 2005 01:12:34 -0000	1.483
  +++ ChangeLog	7 Dec 2005 01:16:29 -0000	1.484
  @@ -1,4 +1,3 @@
  -<<<<<<< ChangeLog
   2005-12-05  David Hyatt  <hyatt at apple.com>
   
   	Add support for more methods for exposing more useful style information.
  @@ -73,7 +72,6 @@
           (-[DOMDocument getMatchedCSSRules::]):
           * kwq/DOMPrivate.h:
   
  -=======
   2005-12-04  Maciej Stachowiak  <mjs at apple.com>
   
           Reviewed by Eric.
  @@ -328,7 +326,6 @@
           * khtml/khtmlview.cpp: (KHTMLView::dispatchMouseEvent): Do the same "skip text node"
           logic for the "oldUnder" variable as for the "targetNode" variable.
   
  ->>>>>>> 1.482
   2005-12-05  John Sullivan  <sullivan at apple.com>
   
           Reviewed by Darin Adler.