[webkit-changes] cvs commit: WebCore ChangeLog

Fri Dec 30 12:43:09 PST 2005

ggaren      05/12/30 12:43:09

  Modified:    .        ChangeLog
  Log:
  Remove conflict marker from ChangeLog

  Revision  Changes    Path
  1.68      +0 -1      WebCore/ChangeLog

  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- ChangeLog	30 Dec 2005 20:42:12 -0000	1.67
  +++ ChangeLog	30 Dec 2005 20:43:09 -0000	1.68
  @@ -202,7 +202,6 @@
           * ksvg2/svg/SVGRectElementImpl.cpp:
           (SVGRectElementImpl::toPathData): fixed round rect calculations

  ->>>>>>> 1.66
   2005-12-29  Mark Rowe  <opendarwin.org at bdash.net.nz>

           Reviewed by eseidel, ggaren, darin.