diff options
| author | Glenn Morris | 2019-08-29 11:12:12 -0700 |
|---|---|---|
| committer | Glenn Morris | 2019-08-29 11:12:12 -0700 |
| commit | 51cf9161ceaa613a95f714e56fb793dcf62d1da6 (patch) | |
| tree | 1a9b27d11c756506c70af54211fc75271b7c6c8f | |
| parent | 040b305752de07d9b564536afeb6a2d2b67e48b9 (diff) | |
| parent | 1af1240f5f101ce3a4db30675a665ee70a9f8c81 (diff) | |
| download | emacs-51cf9161ceaa613a95f714e56fb793dcf62d1da6.tar.gz emacs-51cf9161ceaa613a95f714e56fb793dcf62d1da6.zip | |
Merge from origin/emacs-26
1af1240 (origin/emacs-26, emacs-26) ; Remove empty NEWS sections
96dd019 (tag: emacs-26.3-rc1, tag: emacs-26.3) * etc/HISTORY: Add Ema...
# Conflicts:
# etc/NEWS
| -rw-r--r-- | etc/HISTORY | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/HISTORY b/etc/HISTORY index bf03692d3ff..6cda28d15a6 100644 --- a/etc/HISTORY +++ b/etc/HISTORY | |||
| @@ -218,6 +218,8 @@ GNU Emacs 26.1 (2018-05-28) emacs-26.1 | |||
| 218 | 218 | ||
| 219 | GNU Emacs 26.2 (2019-04-12) emacs-26.2 | 219 | GNU Emacs 26.2 (2019-04-12) emacs-26.2 |
| 220 | 220 | ||
| 221 | GNU Emacs 26.3 (2019-08-28) emacs-26.3 | ||
| 222 | |||
| 221 | 223 | ||
| 222 | ---------------------------------------------------------------------- | 224 | ---------------------------------------------------------------------- |
| 223 | This file is part of GNU Emacs. | 225 | This file is part of GNU Emacs. |