aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.3
diff options
context:
space:
mode:
authorXue Fuqiao2013-06-12 20:12:47 +0800
committerXue Fuqiao2013-06-12 20:12:47 +0800
commit6186a2767fcae48a43675dabc457ed2b2177b884 (patch)
tree8eb823df7cbd64d9bf9201c03cadd89fe1e441ac /src/ChangeLog.3
parent8d0b26f65d9d4cf52a11a273073cd52fb1feaf13 (diff)
parent5f9dbd7a1241239b5376435e96fbd9dbfa65e0f5 (diff)
downloademacs-6186a2767fcae48a43675dabc457ed2b2177b884.tar.gz
emacs-6186a2767fcae48a43675dabc457ed2b2177b884.zip
Merge from mainline.
Diffstat (limited to 'src/ChangeLog.3')
-rw-r--r--src/ChangeLog.32
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
154531989-05-08 Richard Stallman (rms@sugar-bombs.ai.mit.edu) 154531989-05-08 Richard Stallman (rms@sugar-bombs.ai.mit.edu)