texinfo ChangeLog

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/11/20 22:47:02

Modified files:
        .              : ChangeLog 

Log message:
        missed cvs merge marker

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1451&r2=1.1452

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1451
retrieving revision 1.1452
diff -u -b -r1.1451 -r1.1452
--- ChangeLog   20 Nov 2012 19:34:13 -0000      1.1451
+++ ChangeLog   20 Nov 2012 22:47:02 -0000      1.1452
@@ -47,7 +47,6 @@
        * info/nodes.h (FILE_BUFFER) <filesize>: Change type to size_t.
        * NEWS: Update.
        
->>>>>>> 1.1449
 2012-11-16  Eli Zaretskii  <address@hidden>
 
        Support for MS-Windows screen and keyboard in Info.