Mercurial > emacs

comparison lisp/ChangeLog @ 109936:e1a5ebb1ce1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lisp/ChangeLog: Remove merge markers.
author Juanma Barranquero <lekktu@gmail.com>
date Thu, 19 Aug 2010 01:32:39 +0200
parents dbb2115db9d9
children 9b8e40e0bf3c
comparison
equal deleted inserted replaced
109935:dbb2115db9d9 109936:e1a5ebb1ce1c
71 71
72 * international/mule-conf.el (compound-text): Doc fix. 72 * international/mule-conf.el (compound-text): Doc fix.
73 (ctext-no-compositions): Doc fix. 73 (ctext-no-compositions): Doc fix.
74 (compound-text-with-extensions): Doc fix. 74 (compound-text-with-extensions): Doc fix.
75 75
76 >>>>>>> MERGE-SOURCE
77 2010-08-04 Stefan Monnier <monnier@iro.umontreal.ca> 76 2010-08-04 Stefan Monnier <monnier@iro.umontreal.ca>
78 77
79 * simple.el (exchange-dot-and-mark): Mark obsolete, finally. 78 * simple.el (exchange-dot-and-mark): Mark obsolete, finally.
80 79
81 2010-08-03 Juanma Barranquero <lekktu@gmail.com> 80 2010-08-03 Juanma Barranquero <lekktu@gmail.com>