[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 4b72b4f 07/10: Merge from origin/emacs-24
From: |
Fabián Ezequiel Gallina |
Subject: |
[Emacs-diffs] master 4b72b4f 07/10: Merge from origin/emacs-24 |
Date: |
Sat, 27 Dec 2014 18:50:43 +0000 |
branch: master
commit 4b72b4f91122704b805e2696b2e9342226359de0
Merge: 938d651 bef46ba
Author: Fabián Ezequiel Gallina <address@hidden>
Commit: Fabián Ezequiel Gallina <address@hidden>
Merge from origin/emacs-24
bef46ba Fix bad bug number reference, shall be 19427.
Conflicts:
src/ChangeLog
---
src/ChangeLog | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index 9bc28de..b587143 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
* xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert
when going to fullscreen (Bug#0x180004f).
+
2014-12-27 Stefan Monnier <address@hidden>
* buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring.
@@ -10,8 +11,6 @@
* gnutls.c (gnutls_init): Fix deprecation warning from GCC.
-2014-12-27 Eli Zaretskii <address@hidden>
-
2014-12-26 Paul Eggert <address@hidden>
Use bool for boolean in xselect.c, xsettings.c
- [Emacs-diffs] master updated (6d14e0d -> 848343f), Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master cd1ed48 02/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 6e66744 03/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master c3c51ec 04/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 938d651 06/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 3a12f2e 01/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 4b72b4f 07/10: Merge from origin/emacs-24,
Fabián Ezequiel Gallina <=
- [Emacs-diffs] master f315b69 08/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 848343f 10/10: Sanitize ChangeLog entries for previous merges., Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 411c1c6 05/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27
- [Emacs-diffs] master 35e1f9d 09/10: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2014/12/27