diff options
author | Ron Yorston <rmy@pobox.com> | 2022-01-13 08:02:41 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2022-01-13 08:02:41 +0000 |
commit | 4734416a21312488a5099a297907783bee4ccc22 (patch) | |
tree | e42b034f9685a0a07ad080076b757bfba654cf7d /console-tools | |
parent | b8751bbc9ac24e71fbe1e79c69074b4c87a134d8 (diff) | |
parent | b3eec1651fb02d70716caa355f49320719f74c75 (diff) | |
download | busybox-w32-4734416a21312488a5099a297907783bee4ccc22.tar.gz busybox-w32-4734416a21312488a5099a297907783bee4ccc22.tar.bz2 busybox-w32-4734416a21312488a5099a297907783bee4ccc22.zip |
Merge busybox into merge
Fix merge conflicts in coreutils/ls.c and shell/ash.c.
Update config files to turn off SHA1_HWACCEL. It uses non-portable
assembler.
Diffstat (limited to 'console-tools')
-rw-r--r-- | console-tools/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/console-tools/reset.c b/console-tools/reset.c index 2f65aad15..e0d228d50 100644 --- a/console-tools/reset.c +++ b/console-tools/reset.c | |||
@@ -24,7 +24,7 @@ | |||
24 | //usage:#define reset_trivial_usage | 24 | //usage:#define reset_trivial_usage |
25 | //usage: "" | 25 | //usage: "" |
26 | //usage:#define reset_full_usage "\n\n" | 26 | //usage:#define reset_full_usage "\n\n" |
27 | //usage: "Reset the screen" | 27 | //usage: "Reset terminal (ESC codes) and termios (signals, buffering, echo)" |
28 | 28 | ||
29 | /* "Standard" version of this tool is in ncurses package */ | 29 | /* "Standard" version of this tool is in ncurses package */ |
30 | 30 | ||