diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
| commit | 1118c95535ea51961437089fc3dece5ab4ea7e1b (patch) | |
| tree | 1515bd2376a6d6c5123791662307ce2ed90cdf36 /coreutils/Config.src | |
| parent | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (diff) | |
| parent | 066f39956641300c1e5c6bfe6c11a115cea3e2cf (diff) | |
| download | busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.gz busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.bz2 busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.zip | |
Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge
Conflicts:
procps/ps.c
Diffstat (limited to 'coreutils/Config.src')
| -rw-r--r-- | coreutils/Config.src | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/coreutils/Config.src b/coreutils/Config.src index 2769aa07d..dcb5add8f 100644 --- a/coreutils/Config.src +++ b/coreutils/Config.src | |||
| @@ -276,12 +276,6 @@ config HOSTID | |||
| 276 | hostid prints the numeric identifier (in hexadecimal) for | 276 | hostid prints the numeric identifier (in hexadecimal) for |
| 277 | the current host. | 277 | the current host. |
| 278 | 278 | ||
| 279 | config ID | ||
| 280 | bool "id" | ||
| 281 | default y | ||
| 282 | help | ||
| 283 | id displays the current user and group ID names. | ||
| 284 | |||
| 285 | config INSTALL | 279 | config INSTALL |
| 286 | bool "install" | 280 | bool "install" |
| 287 | default y | 281 | default y |