procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Eli Zaretskii 2012-09-01 15:23:50 +03:00
parent 25eac50084
commit f18cbb28c2
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ChangeLog
View file

@ -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 <dmantipov@yandex.ru>