diff options
| author | Ron Yorston <rmy@pobox.com> | 2019-05-27 11:56:52 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2019-05-27 11:56:52 +0100 |
| commit | a61949401890cbb33a9d6c4571b51c53460ad438 (patch) | |
| tree | 64dedaddb89896d5b1670a421af123670ca2120b /coreutils/ls.c | |
| parent | 03a7b173605a890e1db5177ecd5b8dd591081c41 (diff) | |
| parent | bcb1fc3e6ca6fe902610f507eaf9b0b58a5c583a (diff) | |
| download | busybox-w32-a61949401890cbb33a9d6c4571b51c53460ad438.tar.gz busybox-w32-a61949401890cbb33a9d6c4571b51c53460ad438.tar.bz2 busybox-w32-a61949401890cbb33a9d6c4571b51c53460ad438.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/ls.c')
| -rw-r--r-- | coreutils/ls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index 6be3eb291..3eff5a949 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
| @@ -1096,7 +1096,7 @@ int ls_main(int argc UNUSED_PARAM, char **argv) | |||
| 1096 | static const char ls_longopts[] ALIGN1 = | 1096 | static const char ls_longopts[] ALIGN1 = |
| 1097 | "full-time\0" No_argument "\xff" | 1097 | "full-time\0" No_argument "\xff" |
| 1098 | "group-directories-first\0" No_argument "\xfe" | 1098 | "group-directories-first\0" No_argument "\xfe" |
| 1099 | "color\0" Optional_argument "\xfd" | 1099 | IF_FEATURE_LS_COLOR("color\0" Optional_argument "\xfd") |
| 1100 | ; | 1100 | ; |
| 1101 | #endif | 1101 | #endif |
| 1102 | 1102 | ||