Merged from

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-32
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-33
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-34
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-35
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-36
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-37
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-8
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-9
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-10
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-11
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-12
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-13
   Merge from emacs--devo--0

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-504

1 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c85a6e78e73..056bb851f4a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-02  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (decode_composition_emacs_mule): Fix handling of
+        incorrect format data.
+
+2006-01-31  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (update_frame_tool_bar): Use new tool bar functions
+        (gtk_toolbar_insert) so we can have tool bars of different sizes.
+
 2006-01-30  Luc Teirlinck  <teirllm@auburn.edu>
 
         * data.c (Flistp): Doc fix.