diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-15 16:33:33 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-15 16:33:33 +1000 |
| commit | 924d22029b978432c4a65a905a981b4661102edf (patch) | |
| tree | 469957575269fabe3e8b7ddb412123da22185a4c /scripts | |
| parent | c5ef3a03d7d111634a1d2e4f72dcb1102049b592 (diff) | |
| parent | 4fd7461aeaac63edb004696e722bf36e7f6f402c (diff) | |
| download | busybox-w32-924d22029b978432c4a65a905a981b4661102edf.tar.gz busybox-w32-924d22029b978432c4a65a905a981b4661102edf.tar.bz2 busybox-w32-924d22029b978432c4a65a905a981b4661102edf.zip | |
Merge branch 'procps'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/defconfig.mingw32 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/defconfig.mingw32 b/scripts/defconfig.mingw32 index 23ac8b067..1669380ac 100644 --- a/scripts/defconfig.mingw32 +++ b/scripts/defconfig.mingw32 | |||
| @@ -845,16 +845,16 @@ CONFIG_FEATURE_MIME_CHARSET="" | |||
| 845 | # CONFIG_SMEMCAP is not set | 845 | # CONFIG_SMEMCAP is not set |
| 846 | # CONFIG_FREE is not set | 846 | # CONFIG_FREE is not set |
| 847 | # CONFIG_FUSER is not set | 847 | # CONFIG_FUSER is not set |
| 848 | # CONFIG_KILL is not set | 848 | CONFIG_KILL=y |
| 849 | # CONFIG_KILLALL is not set | 849 | CONFIG_KILLALL=y |
| 850 | # CONFIG_KILLALL5 is not set | 850 | # CONFIG_KILLALL5 is not set |
| 851 | # CONFIG_NMETER is not set | 851 | # CONFIG_NMETER is not set |
| 852 | # CONFIG_PGREP is not set | 852 | CONFIG_PGREP=y |
| 853 | # CONFIG_PIDOF is not set | 853 | CONFIG_PIDOF=y |
| 854 | # CONFIG_FEATURE_PIDOF_SINGLE is not set | 854 | CONFIG_FEATURE_PIDOF_SINGLE=y |
| 855 | # CONFIG_FEATURE_PIDOF_OMIT is not set | 855 | CONFIG_FEATURE_PIDOF_OMIT=y |
| 856 | # CONFIG_PKILL is not set | 856 | # CONFIG_PKILL is not set |
| 857 | # CONFIG_PS is not set | 857 | CONFIG_PS=y |
| 858 | # CONFIG_FEATURE_PS_WIDE is not set | 858 | # CONFIG_FEATURE_PS_WIDE is not set |
| 859 | # CONFIG_FEATURE_PS_TIME is not set | 859 | # CONFIG_FEATURE_PS_TIME is not set |
| 860 | # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set | 860 | # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set |