changeset 87909:5fb00dd7ea17

Fix merge errors (duplicates).
author Glenn Morris <rgm@gnu.org>
date Wed, 23 Jan 2008 05:47:13 +0000
parents 8d26c1b4608e
children 79fe43632348
files lisp/ChangeLog
diffstat 1 files changed, 0 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Jan 23 05:46:13 2008 +0000
+++ b/lisp/ChangeLog	Wed Jan 23 05:47:13 2008 +0000
@@ -9,20 +9,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):