CVSROOT: /sources/gnash
Module name: gnash
Changes by: Martin Guy <martinwguy> 07/03/20 20:29:56
Modified files:
. : ChangeLog
Log message:
Remove stray conflict marker
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2656&r2=1.2657
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2656
retrieving revision 1.2657
diff -u -b -r1.2656 -r1.2657
--- ChangeLog 20 Mar 2007 20:27:29 -0000 1.2656
+++ ChangeLog 20 Mar 2007 20:29:55 -0000 1.2657
@@ -60,7 +60,6 @@
* testsuite/actionscript.all/Function.as:
Couple of more successes.
->>>>>>> 1.2655
2007-03-20 Sandro Santilli <[EMAIL PROTECTED]>
* server/array.cpp, server/as_environment.cpp,
_______________________________________________
Gnash-commit mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnash-commit
