[Emacs-diffs] Changes to emacs/src/ChangeLog,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/02/02 04:47:41

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.6108
retrieving revision 1.6109
diff -u -b -r1.6108 -r1.6109
--- ChangeLog   2 Feb 2008 04:31:16 -0000       1.6108
+++ ChangeLog   2 Feb 2008 04:47:40 -0000       1.6109
@@ -354,7 +354,6 @@
        * ftfont.c (ftfont_open): Set members maybe_otf and otf of
        ftfont_info only when HAVE_LIBOTF is defined.
 
->>>>>>> 1.1.2.202
 2008-02-01  Andreas Schwab  <address@hidden>
 
        * xdisp.c (back_to_previous_visible_line_start): Fix type of beg
@@ -366,8 +365,6 @@
 
 2008-02-01  Kenichi Handa  <address@hidden>
 
-       * config.in: Re-generated.
-
        * Makefile.in (ALL_CFLAGS): Add @address@hidden
        (FONTSRC, FONTOBJ) [HAVE_WINDOW_SYSTEM]: Set them unconditionally.
        (LIBES): Add @address@hidden
@@ -1922,8 +1919,6 @@
        * composite.h (enum composition_method) [USE_FONT_BACKEND]: New
        enumeration COMPOSITION_WITH_GLYPH_STRING.
 
-       * config.in: Re-generated.
-
        * dispextern.h (struct glyph_string) [USE_FONT_BACKEND]: New
        members clip_x, clip_y, clip_width, and clip_height.
        (struct face) [USE_FONT_BACKEND]: New members font_info and extra.