diff options
| author | Yuuki Harano | 2021-07-25 23:34:55 +0900 |
|---|---|---|
| committer | Yuuki Harano | 2021-07-25 23:34:55 +0900 |
| commit | 13a9a5e836cbe6e64aadaba40fe1f7eb83320d08 (patch) | |
| tree | 242ac1f485cf6762680a904952747d63b295e198 /admin | |
| parent | b242394f24b154f8e20f5abf4b2f826629e99ea6 (diff) | |
| parent | 41a55a330f518254da795719ac6e3085254d4110 (diff) | |
| download | emacs-13a9a5e836cbe6e64aadaba40fe1f7eb83320d08.tar.gz emacs-13a9a5e836cbe6e64aadaba40fe1f7eb83320d08.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/merge-gnulib | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 1c8b4427000..c12e83dd2fa 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -33,7 +33,7 @@ GNULIB_MODULES=' | |||
| 33 | crypto/md5-buffer crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer | 33 | crypto/md5-buffer crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer |
| 34 | d-type diffseq double-slash-root dtoastr dtotimespec dup2 | 34 | d-type diffseq double-slash-root dtoastr dtotimespec dup2 |
| 35 | environ execinfo explicit_bzero faccessat | 35 | environ execinfo explicit_bzero faccessat |
| 36 | fchmodat fcntl fcntl-h fdopendir | 36 | fchmodat fcntl fcntl-h fdopendir file-has-acl |
| 37 | filemode filename filevercmp flexmember fpieee | 37 | filemode filename filevercmp flexmember fpieee |
| 38 | free-posix fstatat fsusage fsync futimens | 38 | free-posix fstatat fsusage fsync futimens |
| 39 | getloadavg getopt-gnu getrandom gettime gettimeofday gitlog-to-changelog | 39 | getloadavg getopt-gnu getrandom gettime gettimeofday gitlog-to-changelog |