From: Glenn Morris <rgm@gnu.org>
Date: Wed, 23 Jan 2008 05:47:31 +0000 (+0000)
Subject: Fix merge errors (duplicates).
X-Git-Tag: emacs-pretest-23.0.90~8455
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a025cb2f916b40dd553c68e602ee5776718563ab;p=emacs.git

Fix merge errors (duplicates).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6261d014487..665552955d9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-23  Glenn Morris  <rgm@gnu.org>
+
+	* textmodes/org.el (org-export-latex-cleaned-string): Fix declaration.
+
 2008-01-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* progmodes/sh-script.el (sh-basic-offset):
@@ -9,20 +13,6 @@
 	* icomplete.el (icomplete-get-keys):
 	Look up KEYS using all maps in proper buffer.
 
-2008-01-23  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-	    Miles Bader  <miles@gnu.org>
-
-	* blank-mode.el: New file.  Minor mode to visualise TAB,
-	(HARD) SPACE, NEWLINE.  Miles Bader <miles@gnu.org> wrote the original
-	code for handling display table (via visws.el package), his code was
-	modified, but the main idea was kept.
-
-2008-01-23  Alan Mackenzie  <acm@muc.de>
-
-	* progmodes/cc-vars.el (c-constant-symbol): Put this defun inside
-	an eval-and-compile, so as to permit byte-compiling (e.g. in
-	bootstrap).
-
 2008-01-23  Juanma Barranquero  <lekktu@gmail.com>
 
 	* frame.el (display-mm-height, display-mm-width):