diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:05:02 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:05:02 -0800 |
| commit | 0a89d04cf78de9c7c6942cc48b79b67e6f05a68c (patch) | |
| tree | 288959b9e2bcf98b9b8b74d6dc44aefbf2f98c0a /lib | |
| parent | 88b65c6357f91b9080ab4b8ca398ddd6203c3247 (diff) | |
| parent | 665be694b641b040b67def026e03d6e965bccb03 (diff) | |
| download | emacs-0a89d04cf78de9c7c6942cc48b79b67e6f05a68c.tar.gz | |
Merge from origin/emacs-25
665be69 ; Update ChangeLog.2 and AUTHORS files
# Conflicts:
# etc/AUTHORS
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions