diff src/xdisp.c @ 109936:e1a5ebb1ce1c

lisp/ChangeLog: Remove merge markers.
author Juanma Barranquero <lekktu@gmail.com>
date Thu, 19 Aug 2010 01:32:39 +0200
parents 3f57ce01b15a
children 60516122d066 cca2a663ef92
line wrap: on
line diff