diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:09:09 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:09:09 -0700 |
| commit | f902a6b89e6970eabaaf3c2c1452bf2104e2004b (patch) | |
| tree | 9c9c2d5329af83b6cdf9de3871e268072b96ffeb /admin | |
| parent | a855bf48d42cd7cbc9c72def3584fd354d433f97 (diff) | |
| parent | ff3fc21e24edffccce0d42065833e852a6792bd2 (diff) | |
; Merge from origin/emacs-25
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...
Diffstat (limited to 'admin')
0 files changed, 0 insertions, 0 deletions