1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00

Merge from origin/emacs-26

70829f8 ; ChangeLog.3 update

# Conflicts:
#	ChangeLog.3
This commit is contained in:
Glenn Morris 2019-08-29 11:11:23 -07:00
commit e7f16f00e1

View File

@ -1,3 +1,8 @@
2019-08-29 Nicolas Petton <nicolas@petton.fr>
* etc/AUTHORS: Update.
2019-08-29 Nicolas Petton <nicolas@petton.fr>
2019-08-29 Nicolas Petton <nicolas@petton.fr>
* etc/NEWS: Delete temporary markup.
@ -66518,7 +66523,7 @@
This file records repository revisions from
commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
commit e8f176b6423a1b4d456e2c332415c32982ff4553 (inclusive).
commit a6d0172e8330a5683517eba78356d4c70ad979d7 (inclusive).
See ChangeLog.1 for earlier changes.
;; Local Variables: