diff options
| author | Po Lu | 2023-03-11 09:55:05 +0800 |
|---|---|---|
| committer | Po Lu | 2023-03-11 09:55:05 +0800 |
| commit | f573ce3f66daefbb26dec079581eb7cc755a9b3c (patch) | |
| tree | df88bcbaffe1f0bc1ee38209e8d7cffc6e0fad7b /admin | |
| parent | 248b34596159c460a4afd152035e226c44cf31fd (diff) | |
| parent | c6bfffa9fe1af7f4f806e5533ba5f3c33476cf9a (diff) | |
| download | emacs-f573ce3f66daefbb26dec079581eb7cc755a9b3c.tar.gz emacs-f573ce3f66daefbb26dec079581eb7cc755a9b3c.zip | |
Merge remote-tracking branch 'origin/master' into feature/android
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 4e84e1a2c8d..8065a9267d0 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -46,7 +46,7 @@ GNULIB_MODULES=' | |||
| 46 | qcopy-acl readlink readlinkat regex | 46 | qcopy-acl readlink readlinkat regex |
| 47 | sig2str sigdescr_np socklen stat-time std-gnu11 stdbool stddef stdio | 47 | sig2str sigdescr_np socklen stat-time std-gnu11 stdbool stddef stdio |
| 48 | stpcpy stpncpy strnlen strtoimax symlink sys_stat sys_time | 48 | stpcpy stpncpy strnlen strtoimax symlink sys_stat sys_time |
| 49 | tempname time time_r time_rz timegm timer-time timespec-add timespec-sub | 49 | tempname time-h time_r time_rz timegm timer-time timespec-add timespec-sub |
| 50 | update-copyright unlocked-io utimensat | 50 | update-copyright unlocked-io utimensat |
| 51 | vla warnings | 51 | vla warnings |
| 52 | ' | 52 | ' |