From: Eli Zaretskii Date: Sat, 1 Sep 2012 12:23:50 +0000 (+0300) Subject: Remove conflict markers and fix entries for 2012-09-01T06:38:52Z!dancol@dancol.org. X-Git-Tag: emacs-24.2.90~449 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f18cbb28c26c300dbe37de6950d4ef918de9c61b;p=emacs.git Remove conflict markers and fix entries for 2012-09-01T06:38:52Z!dancol@dancol.org. --- diff --git a/src/ChangeLog b/src/ChangeLog index 56e45503ad0..5b58d77e54a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -37,7 +37,7 @@ * w32term.h (FRAME_X_WINDOW): Use FRAME_W32_WINDOW instead of directly accessing frame internals. - * w32font.h (w): Include font.h. Define syms_of_w32font and + * w32font.h: Include font.h. Define syms_of_w32font and globals_of_w32font. * process.c: Include TERM_HEADER instead of listing all possible @@ -80,15 +80,14 @@ * emacs.c: Include TERM_HEADER. - * dispnew.c (d): Include TERM_HEADER instead of listing all - possible window-system headers. + * dispnew.c: Include TERM_HEADER instead of listing all possible + window-system headers. - * ccl.h (c): Include character.h. + * ccl.h: Include character.h. * Makefile.in: Define WINDOW_SYSTEM_OBJ to hold objects needed for the current window system; include in list of objects to link into Emacs. ->>>>>>> MERGE-SOURCE 2012-08-31 Dmitry Antipov