[Gnash-commit] gnash ChangeLog

[Chad Musick]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Chad Musick <cmusick>   07/08/27 18:14:45

Modified files:
        .              : ChangeLog 

Log message:
        Remove conflict indicators.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4124
retrieving revision 1.4125
diff -u -b -r1.4124 -r1.4125
--- ChangeLog   27 Aug 2007 18:13:38 -0000      1.4124
+++ ChangeLog   27 Aug 2007 18:14:44 -0000      1.4125
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2007-08-28 Chad Musick <address@hidden>
 
        * server/asobj/BlurFilter_as.cpp,.h
@@ -25,14 +24,12 @@
        * server/asobj/Makefile.am
          Add new files
         
-=======
 2007-08-27 Sandro Santilli <address@hidden>
 
        * libbase/utility.h: don't define exp2(), it's going to clash
          with existing symbol on most systems (except some BSDen)...
          Please provide a better patch for BSD.
 
->>>>>>> 1.4123
 2007-08-27 Deanna Phillips <deanna>
 
        * testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp: include