[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109841: Remove conflict markers and
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109841: Remove conflict markers and fix entries for revision 109836. |
Date: |
Sat, 01 Sep 2012 15:23:50 +0300 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109841
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-01 15:23:50 +0300
message:
Remove conflict markers and fix entries for revision 109836.
modified:
src/ChangeLog
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-09-01 09:29:17 +0000
+++ b/src/ChangeLog 2012-09-01 12:23:50 +0000
@@ -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 <address@hidden>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109841: Remove conflict markers and fix entries for revision 109836.,
Eli Zaretskii <=