From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <eggert@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1211)
 id 221DF3858D39; Wed, 22 Sep 2021 01:00:27 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 221DF3858D39
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Paul Eggert <eggert@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] Mention today's regex merge in SHARED-FILES
X-Act-Checkin: glibc
X-Git-Author: Paul Eggert <eggert@cs.ucla.edu>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 1356f38df5be0776823eb2c40cc4e607b86b9680
X-Git-Newrev: ed05f7dded5f613f31fcde66dd2fe9a79d6ffe23
Message-Id: <20210922010027.221DF3858D39@sourceware.org>
Date: Wed, 22 Sep 2021 01:00:27 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Sep 2021 01:00:27 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ed05f7dded5f613f31fcde66dd2fe9a79d6ffe23

commit ed05f7dded5f613f31fcde66dd2fe9a79d6ffe23
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Sep 21 17:53:13 2021 -0700

    Mention today's regex merge in SHARED-FILES

Diff:
---
 SHARED-FILES | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/SHARED-FILES b/SHARED-FILES
index 38f189727c..03fa41a4fd 100644
--- a/SHARED-FILES
+++ b/SHARED-FILES
@@ -31,6 +31,10 @@ gnulib:
   crypt/md5.h
   dirent/alphasort.c
   dirent/scandir.c
+  # Merged from gnulib 2021-09-21
+  include/intprops.h
+  # Merged from gnulib 2021-09-21
+  include/regex.h
   locale/programs/3level.h
   # Merged from gnulib 2014-6-23
   malloc/obstack.c
@@ -41,6 +45,8 @@ gnulib:
   misc/error.h
   misc/getpass.c
   misc/mkdtemp.c
+  # Merged from gnulib 2021-09-21
+  misc/sys/cdefs.h
   posix/fnmatch_loop.c
   # Intended to be the same. Gnulib copy contains glibc changes.
   posix/getopt.c
@@ -49,11 +55,17 @@ gnulib:
   # Intended to be the same. Gnulib copy contains glibc changes.
   posix/getopt_int.h
   posix/glob.c
+  # Merged from gnulib 2021-09-21
   posix/regcomp.c
+  # Merged from gnulib 2021-09-21
   posix/regex.c
+  # Merged from gnulib 2021-09-21
   posix/regex.h
+  # Merged from gnulib 2021-09-21
   posix/regex_internal.c
+  # Merged from gnulib 2021-09-21
   posix/regex_internal.h
+  # Merged from gnulib 2021-09-21
   posix/regexec.c
   posix/spawn.c
   posix/spawn_faction_addclose.c