[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 51cf916 6/6: Merge from origin/emacs-26
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 51cf916 6/6: Merge from origin/emacs-26 |
Date: |
Thu, 29 Aug 2019 14:14:48 -0400 (EDT) |
branch: master
commit 51cf9161ceaa613a95f714e56fb793dcf62d1da6
Merge: 040b305 1af1240
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
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
---
etc/HISTORY | 2 ++
1 file changed, 2 insertions(+)
diff --git a/etc/HISTORY b/etc/HISTORY
index bf03692..6cda28d 100644
--- a/etc/HISTORY
+++ b/etc/HISTORY
@@ -218,6 +218,8 @@ GNU Emacs 26.1 (2018-05-28) emacs-26.1
GNU Emacs 26.2 (2019-04-12) emacs-26.2
+GNU Emacs 26.3 (2019-08-28) emacs-26.3
+
----------------------------------------------------------------------
This file is part of GNU Emacs.
- [Emacs-diffs] master updated (9df2852 -> 51cf916), Glenn Morris, 2019/08/29
- [Emacs-diffs] master 5a3e501 2/6: Merge from origin/emacs-26, Glenn Morris, 2019/08/29
- [Emacs-diffs] master 040b305 5/6: ; Merge from origin/emacs-26, Glenn Morris, 2019/08/29
- [Emacs-diffs] master 51cf916 6/6: Merge from origin/emacs-26,
Glenn Morris <=
- [Emacs-diffs] master e7f16f0 4/6: Merge from origin/emacs-26, Glenn Morris, 2019/08/29
- [Emacs-diffs] master 8e8ebd4 3/6: ; Merge from origin/emacs-26, Glenn Morris, 2019/08/29
- [Emacs-diffs] master 6dd4492 1/6: ; Fix earlier NEWS merge, Glenn Morris, 2019/08/29