CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/07/23 04:36:19
Modified files:
. : ChangeLog
Log message:
removed spurious conflict markers
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3787&r2=1.3788
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3787
retrieving revision 1.3788
diff -u -b -r1.3787 -r1.3788
--- ChangeLog 23 Jul 2007 04:09:10 -0000 1.3787
+++ ChangeLog 23 Jul 2007 04:36:19 -0000 1.3788
@@ -195,7 +195,6 @@
server/asobj/{Sound, Netstream}Ffmpeg.h, gui/gnash.cpp: Fix for
linking.
->>>>>>> 1.3749
2007-07-17 Zou Lunkai <[EMAIL PROTECTED]>
* testsuite/actionscript.all/MovieClip.as: more tests, all passed.
@@ -216,7 +215,6 @@
handling cleanups, for better management of key listeners. change
key listeners container from std::vector to std::set. Correct indent.
->>>>>>> 1.3745
2007-07-14 Rob Savoye <[EMAIL PROTECTED]>
* configure.ac: Add new Cygnal directories.
@@ -347,7 +345,6 @@
* testsuite/actionscript.all/Makefile.am: activate enumerate.as and
case.as.
->>>>>>> 1.3741
2007-07-11 Sandro Santilli <[EMAIL PROTECTED]>
* server/edit_text_character.cpp (remove the "default" font logic,
_______________________________________________
Gnash-commit mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnash-commit
