projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a855bf4 ff3fc21)
; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:09:09 +0000 (14:09 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:09:09 +0000 (14:09 -0700)
The following commits were skipped:

ff3fc21 Port to glibc 2.24 (pre-release) + ppc64
eb9d461 * lisp/net/shr.el (shr-fill-line): Withdraw the last commit (...
4157159 * lisp/net/shr.el (shr-fill-line): Preserve text properties i...


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