gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] gnash ChangeLog


From: Markus Gothe
Subject: [Gnash-commit] gnash ChangeLog
Date: Mon, 23 Oct 2006 11:04:30 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/23 11:04:30

Modified files:
        .              : ChangeLog 

Log message:
        Removed conflict indicator

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1359
retrieving revision 1.1360
diff -u -b -r1.1359 -r1.1360
--- ChangeLog   23 Oct 2006 11:03:58 -0000      1.1359
+++ ChangeLog   23 Oct 2006 11:04:30 -0000      1.1360
@@ -18,7 +18,6 @@
          difference between AS_FUNCTION and OBJECT types.
        * server/swf.h: comment on semantic of ACTION_NEWEQUALS.
 
->>>>>>> 1.1358
 2006-10-22 Sandro Santilli <address@hidden>
 
        * server/asobj/: Global.cpp, Makefile.am, Number.cpp, Number.h:




reply via email to

[Prev in Thread] Current Thread [Next in Thread]