diff options
| author | Fabián Ezequiel Gallina | 2014-12-27 13:26:58 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2014-12-27 13:26:58 -0300 |
| commit | 4b72b4f91122704b805e2696b2e9342226359de0 (patch) | |
| tree | be363f256ecf6b4ef3fd9bddfa9c25fe19cb590c /src | |
| parent | 938d65136b6d8c4ea91313216c873d2084be4240 (diff) | |
| parent | bef46ba222e11e6f9942fae796b42e718317ec0e (diff) | |
| download | emacs-4b72b4f91122704b805e2696b2e9342226359de0.tar.gz emacs-4b72b4f91122704b805e2696b2e9342226359de0.zip | |
Merge from origin/emacs-24
bef46ba Fix bad bug number reference, shall be 19427.
Conflicts:
src/ChangeLog
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9bc28de6813..b58714353c1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert | 3 | * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert |
| 4 | when going to fullscreen (Bug#0x180004f). | 4 | when going to fullscreen (Bug#0x180004f). |
| 5 | |||
| 5 | 2014-12-27 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-12-27 Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | 7 | ||
| 7 | * buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring. | 8 | * buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring. |
| @@ -10,8 +11,6 @@ | |||
| 10 | 11 | ||
| 11 | * gnutls.c (gnutls_init): Fix deprecation warning from GCC. | 12 | * gnutls.c (gnutls_init): Fix deprecation warning from GCC. |
| 12 | 13 | ||
| 13 | 2014-12-27 Eli Zaretskii <eliz@gnu.org> | ||
| 14 | |||
| 15 | 2014-12-26 Paul Eggert <eggert@cs.ucla.edu> | 14 | 2014-12-26 Paul Eggert <eggert@cs.ucla.edu> |
| 16 | 15 | ||
| 17 | Use bool for boolean in xselect.c, xsettings.c | 16 | Use bool for boolean in xselect.c, xsettings.c |