[Gnash-commit] gnash ChangeLog

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/16 07:22:39

Modified files:
        .              : ChangeLog 

Log message:
        remove conflict indicators

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5406
retrieving revision 1.5407
diff -u -b -r1.5406 -r1.5407
--- ChangeLog   16 Jan 2008 07:21:58 -0000      1.5406
+++ ChangeLog   16 Jan 2008 07:22:38 -0000      1.5407
@@ -490,12 +490,8 @@
 
        * server/asobj/LocalConnection.{cpp,h}:  Use boost::uint8_t
        instead of char *.
-<<<<<<< ChangeLog
-       
        * po/Makefile.am: Make the directories before trying to install in
-=======
        * po/Makefile.am: Make the dircetories before trying to install in
->>>>>>> 1.5396
        them.
        * testsuite/libamf.all/test_lc.cpp: New test for LocalConnection
        base class.