projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61848d2 e8f0d7d)
; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 1 Jan 2017 09:02:48 +0000 (01:02 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 1 Jan 2017 09:02:48 +0000 (01:02 -0800)
The following commits were skipped:

e8f0d7d Backport: Remove an ambiguity from defvar's doc string.  Fixe...
af1b102 * lisp/emacs-lisp/inline.el: Fix apply-conversion (bug#25280)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.