diff src/xsettings.c @ 109936:e1a5ebb1ce1c

lisp/ChangeLog: Remove merge markers.
author Juanma Barranquero <lekktu@gmail.com>
date Thu, 19 Aug 2010 01:32:39 +0200
parents 7d9b2b9edc21
children 24c4451bcaf7 75b974985fca
line wrap: on
line diff