Fix ChangeLog to reflect merge better.

diff --git a/src/ChangeLog b/src/ChangeLog
index cb22a2d08baa9d8ca572d58af8cf4a9b06d6e258..64ea0a5bcf0ace9d5ed33cf0840b26524c7ec2e8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix minor problems found by static checking (Bug#9031).
+       * chartab.c (char_table_set_range, map_sub_char_table):
+       Remove unused locals.
+       (uniprop_table): Now static.
+       * composite.c (_work_char): Remove unused static var.
+
 2011-07-09  Juanma Barranquero  <lekktu@gmail.com>
 
        * chartab.c (uniprop_table_uncompress): Remove unused local variable.
@@ -12,13 +20,6 @@
 
 2011-07-08  Paul Eggert  <eggert@cs.ucla.edu>
 
-       Fix minor problems found by static checking (Bug#9031).
-       * chartab.c (char_table_set_range, map_sub_char_table)
-       (uniprop_table_uncompress): Remove unused locals.
-       (uniprop_table): Now static.
-       * composite.c (_work_char): Remove unused static var.
-       * gtkutil.c (qttip_cb): Remove stray no-effect statement.
-
        Use pthread_sigmask, not sigprocmask (Bug#9010).
        sigprocmask is portable only for single-threaded applications, and
        Emacs can be multi-threaded when it uses GTK.