diff options
author | Ron Yorston <rmy@pobox.com> | 2019-01-10 08:38:15 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2019-01-10 08:38:15 +0000 |
commit | f99a280743e877c14ee90a3f9e93a34ca3476a27 (patch) | |
tree | 60ca3d17596e190c8c7cbca587168946598bee8a /coreutils/timeout.c | |
parent | 40d5dd07ea1f290eaed30a03fd598e33a8eaf495 (diff) | |
parent | 6ca8e347fed8c24655df692f22694baf7c572770 (diff) | |
download | busybox-w32-f99a280743e877c14ee90a3f9e93a34ca3476a27.tar.gz busybox-w32-f99a280743e877c14ee90a3f9e93a34ca3476a27.tar.bz2 busybox-w32-f99a280743e877c14ee90a3f9e93a34ca3476a27.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/timeout.c')
-rw-r--r-- | coreutils/timeout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/timeout.c b/coreutils/timeout.c index 3b2140807..258cd276f 100644 --- a/coreutils/timeout.c +++ b/coreutils/timeout.c | |||
@@ -28,7 +28,7 @@ | |||
28 | * rewrite 14-11-2008 vda | 28 | * rewrite 14-11-2008 vda |
29 | */ | 29 | */ |
30 | //config:config TIMEOUT | 30 | //config:config TIMEOUT |
31 | //config: bool "timeout (5.5 kb)" | 31 | //config: bool "timeout (6 kb)" |
32 | //config: default y | 32 | //config: default y |
33 | //config: help | 33 | //config: help |
34 | //config: Runs a program and watches it. If it does not terminate in | 34 | //config: Runs a program and watches it. If it does not terminate in |