Commit f18cbb28 authored by Eli Zaretskii's avatar Eli Zaretskii

Remove conflict markers and fix entries for 2012-09-01T06:38:52Z!dancol@dancol.org.

parent 25eac500
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
* w32term.h (FRAME_X_WINDOW): Use FRAME_W32_WINDOW instead of * w32term.h (FRAME_X_WINDOW): Use FRAME_W32_WINDOW instead of
directly accessing frame internals. 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. globals_of_w32font.
* process.c: Include TERM_HEADER instead of listing all possible * process.c: Include TERM_HEADER instead of listing all possible
...@@ -80,15 +80,14 @@ ...@@ -80,15 +80,14 @@
* emacs.c: Include TERM_HEADER. * emacs.c: Include TERM_HEADER.
* dispnew.c (d): Include TERM_HEADER instead of listing all * dispnew.c: Include TERM_HEADER instead of listing all possible
possible window-system headers. 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 * Makefile.in: Define WINDOW_SYSTEM_OBJ to hold objects needed for
the current window system; include in list of objects to link into the current window system; include in list of objects to link into
Emacs. Emacs.
>>>>>>> MERGE-SOURCE
2012-08-31 Dmitry Antipov <dmantipov@yandex.ru> 2012-08-31 Dmitry Antipov <dmantipov@yandex.ru>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment