[Gnash-commit] gnash ChangeLog

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/05/19 22:05:53

Modified files:
        .              : ChangeLog 

Log message:
        Clean-up

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3282
retrieving revision 1.3283
diff -u -b -r1.3282 -r1.3283
--- ChangeLog   19 May 2007 21:45:02 -0000      1.3282
+++ ChangeLog   19 May 2007 22:05:53 -0000      1.3283
@@ -2,6 +2,7 @@
 
        * server/asobj/NetStream.cpp: Got rid of make_pair in favor of
          std::pair<>();
+       * server/cxform.h: include <string>
 
 2007-05-19 Tomas Groth Christensen <address@hidden>
 
@@ -10,7 +11,6 @@
          loops works. We now use condition variables to pause the decoding 
          loop. We now disconnect from the soundhandler when pausing.
 
->>>>>>> 1.3281
 2007-05-18 Sandro Santilli <address@hidden>
 
        * testsuite/misc-ming.all/: Makefile.am, loop_test2.c, loop_test3.c: