From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 10 Jul 2011 04:58:22 +0000 (-0700)
Subject: Fix ChangeLog to reflect merge better.
X-Git-Tag: emacs-pretest-24.0.90~104^2~410
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=99033785c7adac8711cc7c56a99c4e3b441648b1;p=emacs.git

Fix ChangeLog to reflect merge better.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cb22a2d08ba..64ea0a5bcf0 100644
--- 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.