diff options
| author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-12-06 07:42:04 +0000 |
|---|---|---|
| committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-12-06 07:42:04 +0000 |
| commit | 4a8849e4575755eb8bd34cf559676727ffd3b6ee (patch) | |
| tree | 139eb2c9d6e7af6423a492d479f0036c7c31171c /include | |
| parent | 361ec10251d7d62e42e61a32788185e1e6839264 (diff) | |
| download | busybox-w32-4a8849e4575755eb8bd34cf559676727ffd3b6ee.tar.gz busybox-w32-4a8849e4575755eb8bd34cf559676727ffd3b6ee.tar.bz2 busybox-w32-4a8849e4575755eb8bd34cf559676727ffd3b6ee.zip | |
Patch from Steve Merrifield <steve@labyrinth.net.au> to
fixup the merge of the time applet, which I messed up.
-Erik
git-svn-id: svn://busybox.net/trunk/busybox@3837 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 2 | ||||
| -rw-r--r-- | include/usage.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/applets.h b/include/applets.h index 0b9069497..b543de1bc 100644 --- a/include/applets.h +++ b/include/applets.h | |||
| @@ -437,7 +437,7 @@ | |||
| 437 | #ifdef CONFIG_TFTP | 437 | #ifdef CONFIG_TFTP |
| 438 | APPLET(tftp, tftp_main, _BB_DIR_USR_BIN) | 438 | APPLET(tftp, tftp_main, _BB_DIR_USR_BIN) |
| 439 | #endif | 439 | #endif |
| 440 | #ifdef BB_TIME | 440 | #ifdef CONFIG_TIME |
| 441 | APPLET(time, time_main, _BB_DIR_USR_BIN) | 441 | APPLET(time, time_main, _BB_DIR_USR_BIN) |
| 442 | #endif | 442 | #endif |
| 443 | #ifdef CONFIG_TOUCH | 443 | #ifdef CONFIG_TOUCH |
diff --git a/include/usage.h b/include/usage.h index a3447e83a..14d16561f 100644 --- a/include/usage.h +++ b/include/usage.h | |||
| @@ -1704,8 +1704,8 @@ | |||
| 1704 | #define time_trivial_usage \ | 1704 | #define time_trivial_usage \ |
| 1705 | "[OPTION]... COMMAND [ARGS...]" | 1705 | "[OPTION]... COMMAND [ARGS...]" |
| 1706 | #define time_full_usage \ | 1706 | #define time_full_usage \ |
| 1707 | "Runs the program COMMAND with arguments ARGS. When COMMAND finishes,\n" | 1707 | "Runs the program COMMAND with arguments ARGS. When COMMAND finishes,\n" \ |
| 1708 | "COMMAND's resource usage information is displayed\n\n" | 1708 | "COMMAND's resource usage information is displayed\n\n" \ |
| 1709 | "Options:\n" \ | 1709 | "Options:\n" \ |
| 1710 | "\t-v\tDisplays verbose resource usage information." | 1710 | "\t-v\tDisplays verbose resource usage information." |
| 1711 | 1711 | ||
