]> code.delx.au - gnu-emacs/commit
Resolve pull conflict
authorStefan Monnier <monnier@iro.umontreal.ca>
Sun, 16 Nov 2014 05:23:39 +0000 (00:23 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Sun, 16 Nov 2014 05:23:39 +0000 (00:23 -0500)
commit1a713024a012f574d16084cf42703e6ef49473cf
treeea39d9c044b6f950ca59d050472366243ad54df1
parent9075fcc1937a211bc91e8bc49c332bc55ac99e24
parentd409545938d636156b7d0a4ce889197d8fa03e65
Resolve pull conflict
lisp/ChangeLog