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 /procps/pidof.c | |
| 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 'procps/pidof.c')
| -rw-r--r-- | procps/pidof.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/procps/pidof.c b/procps/pidof.c index e102a31c6..6d7b59109 100644 --- a/procps/pidof.c +++ b/procps/pidof.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | //usage:#if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT) | 10 | //usage:#if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT) |
| 11 | //usage:#define pidof_trivial_usage | 11 | //usage:#define pidof_trivial_usage |
| 12 | //usage: "[OPTIONS] [NAME]..." | 12 | //usage: "[OPTIONS] [NAME]..." |
| 13 | //usage:#define USAGE_PIDOF "\n\nOptions:" | 13 | //usage:#define USAGE_PIDOF "\n" |
| 14 | //usage:#else | 14 | //usage:#else |
| 15 | //usage:#define pidof_trivial_usage | 15 | //usage:#define pidof_trivial_usage |
| 16 | //usage: "[NAME]..." | 16 | //usage: "[NAME]..." |