[Gnash-commit] gnash ChangeLog

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/15 07:47:25

Modified files:
        .              : ChangeLog 

Log message:
        conflict tag removed

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5922
retrieving revision 1.5923
diff -u -b -r1.5922 -r1.5923
--- ChangeLog   15 Mar 2008 04:41:07 -0000      1.5922
+++ ChangeLog   15 Mar 2008 07:47:24 -0000      1.5923
@@ -48,7 +48,6 @@
        * libbase/tree.hh: update to version 2.51
        * server/movie_root.cpp: tinker with the tree a bit more.
 
->>>>>>> 1.5920
 2008-03-14 Benjamin Wolsey <address@hidden>
 
        * server/movie_root.{h,cpp}: add getMovieInfo() to fill the info tree