diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-08 19:22:26 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-08 19:22:26 -0800 |
| commit | 8d99e233147d44c2176cef599db754d06b12f5e3 (patch) | |
| tree | 1c98a8e6b702bc3b10fab1d8a2ade1fda4f938a6 /lisp/emacs-lisp/byte-opt.el | |
| parent | d5ccb74848658d20a7b31ea3a2bf5a090468fd5d (diff) | |
| parent | 6c3031399b796feceaab2bdfe94abe7170db4e34 (diff) | |
| download | emacs-8d99e233147d44c2176cef599db754d06b12f5e3.tar.gz emacs-8d99e233147d44c2176cef599db754d06b12f5e3.tar.bz2 emacs-8d99e233147d44c2176cef599db754d06b12f5e3.zip | |
Merge from origin/emacs-26
6c3031399b * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc t...
98288ecaff Further workaround for faulty localtime() under macOS 10.6
Diffstat (limited to 'lisp/emacs-lisp/byte-opt.el')
0 files changed, 0 insertions, 0 deletions