1 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c3af54910a2..59e39614af8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2014-03-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        Fix regression introduced by patch for Bug#10500.
+        * xterm.c (x_draw_image_relief): Respect Vtool_bar_button_margin.
+        * w32term.c (x_draw_image_relief): Likewise.
+
+2014-03-21  Martin Rudalics  <rudalics@gmx.at>
+
+        * w32fns.c (w32_wnd_proc): For WM_WINDOWPOSCHANGING don't
+        constrain frame size in SW_SHOWMAXIMIZED case so we can truly
+        maximize a frame for odd default fonts.
+
 2014-03-21  Glenn Morris  <rgm@gnu.org>
 
         * minibuf.c (history-length): Increase default from 30 to 100.