diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:56:39 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:56:39 +0000 |
| commit | 811c449748d5bd0505f8510e5582892f94ac0cda (patch) | |
| tree | 2640249cb2a9605c7cd59467b9861b205e9bcc8a /coreutils/date.c | |
| parent | c0d4367d6b581eb5989c02815880cf0fa2851ae8 (diff) | |
| parent | 19311bfa7b8e8c6effa9c375de9b0eb4338bee12 (diff) | |
| download | busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.tar.gz busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.tar.bz2 busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.zip | |
Merge commit '19311bfa7b8e8c6effa9c375de9b0eb4338bee12' into merge
Conflicts:
coreutils/ls.c
shell/ash.c
Diffstat (limited to 'coreutils/date.c')
| -rw-r--r-- | coreutils/date.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/coreutils/date.c b/coreutils/date.c index d36ed83fd..497031991 100644 --- a/coreutils/date.c +++ b/coreutils/date.c | |||
| @@ -42,7 +42,8 @@ | |||
| 42 | //config:config FEATURE_DATE_NANO | 42 | //config:config FEATURE_DATE_NANO |
| 43 | //config: bool "Support %[num]N nanosecond format specifier" | 43 | //config: bool "Support %[num]N nanosecond format specifier" |
| 44 | //config: default n | 44 | //config: default n |
| 45 | //config: depends on DATE && PLATFORM_LINUX # syscall(__NR_clock_gettime) | 45 | //config: depends on DATE # syscall(__NR_clock_gettime) |
| 46 | //config: select PLATFORM_LINUX | ||
| 46 | //config: help | 47 | //config: help |
| 47 | //config: Support %[num]N format specifier. Adds ~250 bytes of code. | 48 | //config: Support %[num]N format specifier. Adds ~250 bytes of code. |
| 48 | //config: | 49 | //config: |