From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 29 Mar 2006 09:50:10 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~3390
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=267ee78f8433afef256b77c91096aef41183eebb;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cce64d4572d..d2ed5ea7e7d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-29  Juanma Barranquero  <lekktu@gmail.com>
+
+	* keyboard.c (process_tool_bar_item): Reorder dummy args.
+
 2006-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* keyboard.c (tool_bar_items): Use map_keymap.
@@ -1830,7 +1834,7 @@
 2005-11-11  David Reitter  <david.reitter@gmail.com>
 
 	* macterm.c (syms_of_macterm): Remove macCtrlKey, macShiftKey,
-	macMetaKey, macAltKey. Introduce Qctrl, Qmeta,
+	macMetaKey, macAltKey.  Introduce Qctrl, Qmeta,
 	Vmac_control_modifier / mac-control-modifier,
 	Vmac_option_modifier / mac-option-modifier,
 	Vmac_command_modifier / mac-command-modifier.