Mercurial > emacs
diff src/font.c @ 109936:e1a5ebb1ce1c
lisp/ChangeLog: Remove merge markers.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 19 Aug 2010 01:32:39 +0200 |
parents | 26b234a2e901 |
children | 9d210d83ed69 cda2045a5ee8 |
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 19 Aug 2010 01:32:39 +0200 |
parents | 26b234a2e901 |
children | 9d210d83ed69 cda2045a5ee8 |