diff options
| author | Michael R. Mauger | 2017-08-06 20:58:08 -0400 |
|---|---|---|
| committer | Michael R. Mauger | 2017-08-06 20:58:08 -0400 |
| commit | 6e2c0929bac8d3896d0472222cd3e6b77cb24c35 (patch) | |
| tree | 62668da72d88140958ed22273a6ed6557bc61a4a /admin | |
| parent | df1a71272e5cdd10b511e2ffd702ca50ddd8a773 (diff) | |
| parent | c2f1830d69f5a5e20dac6fcbf3af4d51afba92bd (diff) | |
| download | emacs-6e2c0929bac8d3896d0472222cd3e6b77cb24c35.tar.gz emacs-6e2c0929bac8d3896d0472222cd3e6b77cb24c35.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/merge-gnulib | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 18c9ee8def7..c23e8a40ea7 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -30,7 +30,8 @@ GNULIB_MODULES=' | |||
| 30 | careadlinkat close-stream | 30 | careadlinkat close-stream |
| 31 | count-leading-zeros count-one-bits count-trailing-zeros | 31 | count-leading-zeros count-one-bits count-trailing-zeros |
| 32 | crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 | 32 | crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 |
| 33 | diffseq dtoastr dtotimespec dup2 environ execinfo explicit_bzero faccessat | 33 | d-type diffseq dtoastr dtotimespec dup2 |
| 34 | environ execinfo explicit_bzero faccessat | ||
| 34 | fcntl fcntl-h fdatasync fdopendir | 35 | fcntl fcntl-h fdatasync fdopendir |
| 35 | filemode filevercmp flexmember fstatat fsync | 36 | filemode filevercmp flexmember fstatat fsync |
| 36 | getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog | 37 | getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog |