diff options
author | Glenn Morris <rgm@gnu.org> | 2019-08-29 11:11:23 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2019-08-29 11:11:23 -0700 |
commit | e7f16f00e17c81b9550b4a96540b77bae6a4fc5d (patch) | |
tree | e27adb4c1ef195dfe03d93c68e2c23ca991b33c5 /ChangeLog.3 | |
parent | 8e8ebd44ae292687007f36ee87119a91b3679184 (diff) | |
parent | 70829f8c22b6020321b8e63c74c31f3a4c70e431 (diff) | |
download | emacs-e7f16f00e17c81b9550b4a96540b77bae6a4fc5d.tar.gz emacs-e7f16f00e17c81b9550b4a96540b77bae6a4fc5d.tar.bz2 emacs-e7f16f00e17c81b9550b4a96540b77bae6a4fc5d.zip |
Merge from origin/emacs-26
70829f8 ; ChangeLog.3 update
# Conflicts:
# ChangeLog.3
Diffstat (limited to 'ChangeLog.3')
-rw-r--r-- | ChangeLog.3 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog.3 b/ChangeLog.3 index 48d1c66306e..747fd5627ca 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -1,5 +1,10 @@ 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. 2019-08-29 Noam Postavsky <npostavs@gmail.com> @@ -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: |