Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 7874910c8136abf6ea3180cb1d7f80bd900ab825..c11ecb7e3ae7d94ccdb53a16487eba09fd837374 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-29  Martin Rudalics  <rudalics@gmx.at>
+
+       * gtkutil.c (update_theme_scrollbar_width): Don't round up
+       scroll bar width with GTK3 (Bug#20182).
+
 2015-03-28  Jan Djärv  <jan.h.d@swipnet.se>
 
        * xsmfns.c (smc_save_yourself_CB): Return if Vinvocation_name or