1 files changed, 14 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4c4ac5f8725..9cb3b248232 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-28  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsettings.c (Ftool_bar_get_system_style): Also check for
+        Qtext_image_horiz.
+
+        * xdisp.c (Qtext_image_horiz): Define.
+        (syms_of_xdisp): Initialize Qtext_image_horiz.  Add text-image-horiz
+        to ducumentation of tool-bar-style.
+
+        * lisp.h (Qtext_image_horiz): Declare.
+
+        * gtkutil.c (xg_make_tool_item, xg_show_toolbar_item): Handle tool bar
+        style text_image_horiz.
+
 2010-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * emacs.c (Fkill_emacs): Remove return statement.