annotate lisp/emulation/.cvsignore @ 109936:e1a5ebb1ce1c

lisp/ChangeLog: Remove merge markers.
author Juanma Barranquero <lekktu@gmail.com>
date Thu, 19 Aug 2010 01:32:39 +0200
parents a313aa06c3bd
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
29750
a313aa06c3bd ignore *.elc
Sam Steingold <sds@gnu.org>
parents:
diff changeset
1 *.elc