| commit | 0a89d04cf78de9c7c6942cc48b79b67e6f05a68c | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Sun, 1 Jan 2017 09:05:02 +0000 (1 01:05 -0800) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Sun, 1 Jan 2017 09:05:02 +0000 (1 01:05 -0800) | ||
| tree | 288959b9e2bcf98b9b8b74d6dc44aefbf2f98c0a | treesnapshot (tar.gz zip) |
| parent | 88b65c6357f91b9080ab4b8ca398ddd6203c3247 | commitdiff |
| parent | 665be694b641b040b67def026e03d6e965bccb03 | commitdiff |
Merge from origin/emacs-25
665be69 ; Update ChangeLog.2 and AUTHORS files
# Conflicts:
# etc/AUTHORS
665be69 ; Update ChangeLog.2 and AUTHORS files
# Conflicts:
# etc/AUTHORS
| ChangeLog.2 | diff1 | diff2 | blobhistory |
| etc/AUTHORS | diff1 | diff2 | blobhistory |