diff options
| author | Vincent Belaïche | 2016-01-20 08:30:51 +0100 |
|---|---|---|
| committer | Vincent Belaïche | 2016-01-20 08:30:51 +0100 |
| commit | b895c72059521fec064ff27b4cfcfa4104081c4e (patch) | |
| tree | c1697f0e4d95d8c3556798f6c4c53c98a4714bd0 /admin | |
| parent | badcd38aa86ed7973f2be2743c405710973a0bdd (diff) | |
| parent | 1b76d9168336ede8976b980aeaed64ae2908501a (diff) | |
| download | emacs-b895c72059521fec064ff27b4cfcfa4104081c4e.tar.gz emacs-b895c72059521fec064ff27b4cfcfa4104081c4e.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
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 363bb23d119..40b5b78ee8f 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -32,7 +32,7 @@ GNULIB_MODULES=' | |||
| 32 | dtoastr dtotimespec dup2 environ execinfo faccessat | 32 | dtoastr dtotimespec dup2 environ execinfo faccessat |
| 33 | fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync | 33 | fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync |
| 34 | getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog | 34 | getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog |
| 35 | intprops largefile lstat | 35 | ignore-value intprops largefile lstat |
| 36 | manywarnings memrchr mkostemp mktime | 36 | manywarnings memrchr mkostemp mktime |
| 37 | pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat | 37 | pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat |
| 38 | sig2str socklen stat-time stdalign stddef stdio | 38 | sig2str socklen stat-time stdalign stddef stdio |