Mercurial > emacs

diff src/ChangeLog @ 57534:1a10f9dbc3cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Jason Rumney <jasonr@gnu.org>
date Sat, 16 Oct 2004 23:01:19 +0000
parents 150f1a99cbe4
children 13225583da0d
line wrap: on
line diff
--- a/src/ChangeLog	Sat Oct 16 23:00:26 2004 +0000
+++ b/src/ChangeLog	Sat Oct 16 23:01:19 2004 +0000
@@ -29,7 +29,6 @@
 
 	* fns.c (map_char_table): Add missing gcpros.
 
->>>>>>> 1.3925
 2004-10-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* keymap.c (get_keymap): An autoload form is not a keymap.