diff options
| author | Ron Yorston <rmy@pobox.com> | 2020-05-29 10:49:00 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2020-05-29 11:03:33 +0100 |
| commit | 53c09d0e1720bd927a2995f87df324a9854f1771 (patch) | |
| tree | 982b357d9d188cfb6a1d488ebaba6c42d818209f /configs | |
| parent | d4247a9f03290a96433e18dba538404005a21311 (diff) | |
| parent | 45fa3f18adf57ef9d743038743d9c90573aeeb91 (diff) | |
| download | busybox-w32-53c09d0e1720bd927a2995f87df324a9854f1771.tar.gz busybox-w32-53c09d0e1720bd927a2995f87df324a9854f1771.tar.bz2 busybox-w32-53c09d0e1720bd927a2995f87df324a9854f1771.zip | |
Merge branch 'busybox' into mergeFRP-3466-g53c09d0e1
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/mingw32_defconfig | 3 | ||||
| -rw-r--r-- | configs/mingw64_defconfig | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index afb52b4ee..bffe88842 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Busybox version: 1.32.0.git | 3 | # Busybox version: 1.32.0.git |
| 4 | # Thu May 28 10:59:26 2020 | 4 | # Fri May 29 10:58:25 2020 |
| 5 | # | 5 | # |
| 6 | CONFIG_HAVE_DOT_CONFIG=y | 6 | CONFIG_HAVE_DOT_CONFIG=y |
| 7 | # CONFIG_PLATFORM_POSIX is not set | 7 | # CONFIG_PLATFORM_POSIX is not set |
| @@ -820,6 +820,7 @@ CONFIG_FEATURE_LESS_ENV=y | |||
| 820 | # CONFIG_FEATURE_MAKEDEVS_TABLE is not set | 820 | # CONFIG_FEATURE_MAKEDEVS_TABLE is not set |
| 821 | CONFIG_MAN=y | 821 | CONFIG_MAN=y |
| 822 | # CONFIG_MICROCOM is not set | 822 | # CONFIG_MICROCOM is not set |
| 823 | # CONFIG_MIM is not set | ||
| 823 | # CONFIG_MT is not set | 824 | # CONFIG_MT is not set |
| 824 | # CONFIG_NANDWRITE is not set | 825 | # CONFIG_NANDWRITE is not set |
| 825 | # CONFIG_NANDDUMP is not set | 826 | # CONFIG_NANDDUMP is not set |
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig index 938bbcc3a..d0a541162 100644 --- a/configs/mingw64_defconfig +++ b/configs/mingw64_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Busybox version: 1.32.0.git | 3 | # Busybox version: 1.32.0.git |
| 4 | # Thu May 28 10:59:26 2020 | 4 | # Fri May 29 10:59:57 2020 |
| 5 | # | 5 | # |
| 6 | CONFIG_HAVE_DOT_CONFIG=y | 6 | CONFIG_HAVE_DOT_CONFIG=y |
| 7 | # CONFIG_PLATFORM_POSIX is not set | 7 | # CONFIG_PLATFORM_POSIX is not set |
| @@ -820,6 +820,7 @@ CONFIG_FEATURE_LESS_ENV=y | |||
| 820 | # CONFIG_FEATURE_MAKEDEVS_TABLE is not set | 820 | # CONFIG_FEATURE_MAKEDEVS_TABLE is not set |
| 821 | CONFIG_MAN=y | 821 | CONFIG_MAN=y |
| 822 | # CONFIG_MICROCOM is not set | 822 | # CONFIG_MICROCOM is not set |
| 823 | # CONFIG_MIM is not set | ||
| 823 | # CONFIG_MT is not set | 824 | # CONFIG_MT is not set |
| 824 | # CONFIG_NANDWRITE is not set | 825 | # CONFIG_NANDWRITE is not set |
| 825 | # CONFIG_NANDDUMP is not set | 826 | # CONFIG_NANDDUMP is not set |