diff options
author | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
commit | 40514a0309939f2446f0d4ed9600cad5de396e7f (patch) | |
tree | 0f5f4a57d4bb7893418b5bb11d482858eb17ba8b /miscutils/runlevel.c | |
parent | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (diff) | |
parent | c0cae52662ccced9df19f19ec94238d1b1e3bd71 (diff) | |
download | busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.gz busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.bz2 busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.zip |
Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge
Conflicts:
Makefile.flags
scripts/basic/fixdep.c
Diffstat (limited to 'miscutils/runlevel.c')
-rw-r--r-- | miscutils/runlevel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miscutils/runlevel.c b/miscutils/runlevel.c index 9d38b791f..76231df22 100644 --- a/miscutils/runlevel.c +++ b/miscutils/runlevel.c | |||
@@ -11,7 +11,7 @@ | |||
11 | * | 11 | * |
12 | * initially busyboxified by Bernhard Reutner-Fischer | 12 | * initially busyboxified by Bernhard Reutner-Fischer |
13 | */ | 13 | */ |
14 | 14 | ||
15 | //usage:#define runlevel_trivial_usage | 15 | //usage:#define runlevel_trivial_usage |
16 | //usage: "[FILE]" | 16 | //usage: "[FILE]" |
17 | //usage:#define runlevel_full_usage "\n\n" | 17 | //usage:#define runlevel_full_usage "\n\n" |