[Gnash-commit] gnash ChangeLog

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/04/30 11:10:36

Modified files:
        .              : ChangeLog 

Log message:
        Remove spurious >>>>>>

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3037&r2=1.3038

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3037
retrieving revision 1.3038
diff -u -b -r1.3037 -r1.3038
--- ChangeLog   30 Apr 2007 09:38:45 -0000      1.3037
+++ ChangeLog   30 Apr 2007 11:10:36 -0000      1.3038
@@ -346,7 +346,6 @@
        * extensions/fileio/fileio.cpp: Use intrusive pointers instead of
        explicit pointers.
 
->>>>>>> 1.2990
 2007-04-24 Udo Giacomozzi <address@hidden>
 
        * libgeometry/Range2d.h: added expandToCircle()