diff options
| author | Joakim Verona | 2013-06-12 12:32:25 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-06-12 12:32:25 +0200 |
| commit | e6fa6da6899bf1b4877b96c450eae3934085d560 (patch) | |
| tree | 48e6fda463d24a792ec8428fb8044a250ee2ff82 /src/ChangeLog.3 | |
| parent | 4f0994366d33f8f76db4662cc126720866df3461 (diff) | |
| parent | 84d6f46535554f9f51aae3314313112e8d755c65 (diff) | |
| download | emacs-e6fa6da6899bf1b4877b96c450eae3934085d560.tar.gz emacs-e6fa6da6899bf1b4877b96c450eae3934085d560.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/Makefile.in
src/keyboard.c
src/termhooks.h
Diffstat (limited to 'src/ChangeLog.3')
| -rw-r--r-- | src/ChangeLog.3 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 2f798e1f0bc..fb1b96f738c 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 | |||
| @@ -15447,7 +15447,7 @@ | |||
| 15447 | * xterm.c (XTread_socket_hook): For X11, on map and unmap events | 15447 | * xterm.c (XTread_socket_hook): For X11, on map and unmap events |
| 15448 | check the window manager hints for iconification status. | 15448 | check the window manager hints for iconification status. |
| 15449 | 15449 | ||
| 15450 | * xterm.c (x_make_widow_icon): For X11, just request | 15450 | * xterm.c (x_make_window_icon): For X11, just request |
| 15451 | iconification of the window manager. | 15451 | iconification of the window manager. |
| 15452 | 15452 | ||
| 15453 | 1989-05-08 Richard Stallman (rms@sugar-bombs.ai.mit.edu) | 15453 | 1989-05-08 Richard Stallman (rms@sugar-bombs.ai.mit.edu) |