diff options
| author | Paul Eggert | 2015-03-29 14:24:19 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-03-29 14:24:19 -0700 |
| commit | d16fb740912bf4874e7087f6f419427516047977 (patch) | |
| tree | 0704317ab37ce7a842d0cfe3b739d89e98d8b630 /src/ChangeLog | |
| parent | 97d44922da3c22b3973f95892bfa2ee4afc0ceac (diff) | |
| parent | 4d2e7e17547edda414129aeee910cd0334b4e85e (diff) | |
| download | emacs-d16fb740912bf4874e7087f6f419427516047977.tar.gz emacs-d16fb740912bf4874e7087f6f419427516047977.zip | |
Merge from origin/emacs-24
4d2e7e1 Fixes: debbugs:19175
2e0cfcc Fix the preamble text of the DIR file we install (Bug#20213)
22ece83 src/w32proc.c: Describe in a comment w32 subprocess implementation.
Conflicts:
ChangeLog
src/ChangeLog
src/xterm.c
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c11ecb7e3ae..f0ed9e74745 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2015-03-29 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * gtkutil.c (xg_display_open): | ||
| 4 | * xterm.c (x_display_ok, x_term_init): Block SIGIO when opening | ||
| 5 | a display (Bug#19175). | ||
| 6 | |||
| 1 | 2015-03-29 Martin Rudalics <rudalics@gmx.at> | 7 | 2015-03-29 Martin Rudalics <rudalics@gmx.at> |
| 2 | 8 | ||
| 3 | * gtkutil.c (update_theme_scrollbar_width): Don't round up | 9 | * gtkutil.c (update_theme_scrollbar_width): Don't round up |