Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
f18cbb28
Commit
f18cbb28
authored
Sep 01, 2012
by
Eli Zaretskii
Browse files
Remove conflict markers and fix entries for 2012-09-01T06:38:52Z!dancol@dancol.org.
parent
25eac500
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
src/ChangeLog
src/ChangeLog
+4
-5
No files found.
src/ChangeLog
View file @
f18cbb28
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment