]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c82dee 4f5033f)
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:36:09 +0000 (14:36 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:36:09 +0000 (14:36 -0800)
The following commit was skipped:

4f5033f Backport the :end-of-capability fix


Trivial merge