From: Gerd Möllmann <gerd@gnu.org>
Date: Mon, 21 Aug 2023 07:42:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into scratch/pkg
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fe6009795211844ae2deda602c197cb57265eb64;p=emacs.git

Merge remote-tracking branch 'origin/master' into scratch/pkg
---

fe6009795211844ae2deda602c197cb57265eb64
diff --cc .gitignore
index 4717611ab8c,0a68121009d..ca89bc47f79
--- a/.gitignore
+++ b/.gitignore
@@@ -372,9 -372,9 +372,10 @@@ lib-src/seccomp-filter-exec.pf
  # GDB history
  .gdb_history
  _gdb_history
 +*.desktop
  
  # Files ignored in exec/.
+ exec/aclocal.m4
  exec/config.status
  exec/loader
  exec/test