diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-09-17 11:36:53 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-09-17 11:38:52 +0100 |
| commit | 46299d0c4f4c9a4bbad38bbbe26f196e1bccdc52 (patch) | |
| tree | 6194cdabc0858ae3bed0276679b3b80a722f4150 /configs | |
| parent | cf91de46997888b7096352805c05401e7ebae01e (diff) | |
| parent | 9fe1548bbfde548d54acaab113656a56ea0ccc72 (diff) | |
| download | busybox-w32-46299d0c4f4c9a4bbad38bbbe26f196e1bccdc52.tar.gz busybox-w32-46299d0c4f4c9a4bbad38bbbe26f196e1bccdc52.tar.bz2 busybox-w32-46299d0c4f4c9a4bbad38bbbe26f196e1bccdc52.zip | |
Merge branch 'busybox' into merge
Disable FEATURE_TIMEZONE for now.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/mingw32_defconfig | 1 | ||||
| -rw-r--r-- | configs/mingw64_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index 765653a43..0882741d5 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig | |||
| @@ -147,6 +147,7 @@ CONFIG_FEATURE_COPYBUF_KB=4 | |||
| 147 | # CONFIG_MONOTONIC_SYSCALL is not set | 147 | # CONFIG_MONOTONIC_SYSCALL is not set |
| 148 | # CONFIG_IOCTL_HEX2STR_ERROR is not set | 148 | # CONFIG_IOCTL_HEX2STR_ERROR is not set |
| 149 | # CONFIG_FEATURE_HWIB is not set | 149 | # CONFIG_FEATURE_HWIB is not set |
| 150 | # CONFIG_FEATURE_TIMEZONE is not set | ||
| 150 | 151 | ||
| 151 | # | 152 | # |
| 152 | # Applets | 153 | # Applets |
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig index 656ebb101..358d19d4e 100644 --- a/configs/mingw64_defconfig +++ b/configs/mingw64_defconfig | |||
| @@ -147,6 +147,7 @@ CONFIG_FEATURE_COPYBUF_KB=4 | |||
| 147 | # CONFIG_MONOTONIC_SYSCALL is not set | 147 | # CONFIG_MONOTONIC_SYSCALL is not set |
| 148 | # CONFIG_IOCTL_HEX2STR_ERROR is not set | 148 | # CONFIG_IOCTL_HEX2STR_ERROR is not set |
| 149 | # CONFIG_FEATURE_HWIB is not set | 149 | # CONFIG_FEATURE_HWIB is not set |
| 150 | # CONFIG_FEATURE_TIMEZONE is not set | ||
| 150 | 151 | ||
| 151 | # | 152 | # |
| 152 | # Applets | 153 | # Applets |