[Gnash-commit] gnash ChangeLog server/sprite_instance.h

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  08/05/04 09:13:37

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.h 

Log message:
        typo.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6488&r2=1.6489
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.192&r2=1.193

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6488
retrieving revision 1.6489
diff -u -b -r1.6488 -r1.6489
--- ChangeLog   4 May 2008 09:07:08 -0000       1.6488
+++ ChangeLog   4 May 2008 09:13:35 -0000       1.6489
@@ -172,7 +172,6 @@
          own file and document it, fix the execute
          signature to match the one expected by ControlTag.
 
->>>>>>> 1.6487
 2008-04-30 Sandro Santilli <address@hidden>
 
        * macros/boost.m4: filesystem/exception.hpp might also

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -b -r1.192 -r1.193
--- server/sprite_instance.h    4 May 2008 09:07:09 -0000       1.192
+++ server/sprite_instance.h    4 May 2008 09:13:36 -0000       1.193
@@ -369,11 +369,11 @@
        ///
        /// @use_old_cxform
        /// if true, the cxform of the new character will be set to the old one.
-       /// if false, the cxform the new character will be untouched.
+       /// if false, the cxform of the new character will be untouched.
        ///
        /// @use_old_matrix
-       /// if true, the transformation matrix of the old character will be set 
to the old one.
-       /// if false, the transformation matrix of the old character will be 
untouched.
+       /// if true, the transformation matrix of the new character will be set 
to the old one.
+       /// if false, the transformation matrix of the new character will be 
untouched.
        ///
        void replace_display_object(character* ch,      int depth,
                bool use_old_cxform,