]> git.eshelyaron.com Git - emacs.git/commit
Merge from emacs-24
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 5 Dec 2014 20:20:02 +0000 (15:20 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 5 Dec 2014 20:20:02 +0000 (15:20 -0500)
commitfca389d1d3253c58e198efaa28d175106ce5022a
treeee26e3194caf1e854c2f5844aa772ae4bafaa314
parent0c3f76c6335de0a2d44db37c9ddf953654ca7f32
parente97b6e6f11ceb85f4f3cbe1ecbbc46aa0a8de48a
Merge from emacs-24
admin/gitmerge.el
lisp/ChangeLog
lisp/progmodes/prog-mode.el
lisp/simple.el