master 31e98998304 07/14: Merge from origin/emacs-29

[Eli Zaretskii]

branch: master
commit 31e98998304d275fd1f6f7e1223dfb591e7a7385
Merge: 9f3edb5726a 82d6bb66fea
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-29
    
    82d6bb66fea Update HISTORY and ChangeLog.4
---
 ChangeLog.4 | 20 ++++++++++++++++++++
 etc/HISTORY |  2 ++
 2 files changed, 22 insertions(+)

diff --git a/ChangeLog.4 b/ChangeLog.4
index db65528350c..d8f7fc4a579 100644
--- a/ChangeLog.4
+++ b/ChangeLog.4
@@ -1,3 +1,23 @@
+2023-07-29  Eli Zaretskii  <eliz@maintain0p.gnu.org>
+
+       * Version 29.1 released.
+
+2023-07-23  Eli Zaretskii  <eliz@gnu.org>
+
+       Bump Emacs version
+
+       * README:
+       * configure.ac:
+       * nt/README.W32:
+       * msdos/sed2v2.inp: Bump Emacs version to 29.1.
+
+2023-07-23  Eli Zaretskii  <eliz@gnu.org>
+
+       Update AUTHORS and ChangeLog.4
+
+       * ChangeLog.4:
+       * etc/AUTHORS: Update for Emacs 29.1 release.
+
 2023-07-22  Vincenzo Pupillo  <v.pupillo@gmail.com>
 
        Update JSX support due to upstream changes (bug#64647)
diff --git a/etc/HISTORY b/etc/HISTORY
index 8b80473e321..d60397ab3cb 100644
--- a/etc/HISTORY
+++ b/etc/HISTORY
@@ -230,6 +230,8 @@ GNU Emacs 28.2 (2022-09-12) emacs-28.2
 
 GNU Emacs 28.3 (2023-02-17) emacs-28.3
 
+GNU Emacs 29.1 (2023-07-29) emacs-29.1
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.