[Gnash-commit] gnash ChangeLog

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/05/08 11:33:42

Modified files:
        .              : ChangeLog 

Log message:
        Merge error.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6554
retrieving revision 1.6555
diff -u -b -r1.6554 -r1.6555
--- ChangeLog   8 May 2008 11:33:04 -0000       1.6554
+++ ChangeLog   8 May 2008 11:33:41 -0000       1.6555
@@ -1,3 +1,7 @@
+2008-05-08 Benjamin Wolsey <address@hidden>
+
+       * docs: update logging info in refmanual.
+
 2008-05-08 Sandro Santilli <address@hidden>
 
        * doc/DESIGN: draf a design diagram
@@ -16,10 +20,6 @@
        
 2008-05-08 Benjamin Wolsey <address@hidden>
 
-       * docs: update logging info in refmanual.
-
-2008-05-08 Benjamin Wolsey <address@hidden>
-
        * server/parser/action_buffer.cpp: it's a vector, use push_back.
        * server/swf/PlaceObject2Tag.cpp: use ensureBytes, drop
          assertion, with comment: rely on action_buffer's safety.