diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:19:57 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:19:57 +1000 |
| commit | ec71cb6575290eb6ad716e4f620db445d8e1bcd3 (patch) | |
| tree | 219a5dba000e0ad98ff563bc6f7d45d274d3a178 /libbb/Config.src | |
| parent | b5139d7cd8982d9b683cb1babf0bd759076aaab0 (diff) | |
| parent | 6814cbc9288601840aedb372e2bd84dab76ffa43 (diff) | |
| download | busybox-w32-ec71cb6575290eb6ad716e4f620db445d8e1bcd3.tar.gz busybox-w32-ec71cb6575290eb6ad716e4f620db445d8e1bcd3.tar.bz2 busybox-w32-ec71cb6575290eb6ad716e4f620db445d8e1bcd3.zip | |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'libbb/Config.src')
| -rw-r--r-- | libbb/Config.src | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libbb/Config.src b/libbb/Config.src index 80b1e0d21..9b01757c6 100644 --- a/libbb/Config.src +++ b/libbb/Config.src | |||
| @@ -98,7 +98,7 @@ config FEATURE_USERNAME_COMPLETION | |||
| 98 | 98 | ||
| 99 | config FEATURE_EDITING_FANCY_PROMPT | 99 | config FEATURE_EDITING_FANCY_PROMPT |
| 100 | bool "Fancy shell prompts" | 100 | bool "Fancy shell prompts" |
| 101 | default n | 101 | default y |
| 102 | depends on FEATURE_EDITING | 102 | depends on FEATURE_EDITING |
| 103 | help | 103 | help |
| 104 | Setting this option allows for prompts to use things like \w and | 104 | Setting this option allows for prompts to use things like \w and |
| @@ -153,6 +153,7 @@ config FEATURE_COPYBUF_KB | |||
| 153 | config MONOTONIC_SYSCALL | 153 | config MONOTONIC_SYSCALL |
| 154 | bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" | 154 | bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" |
| 155 | default n | 155 | default n |
| 156 | depends on PLATFORM_LINUX | ||
| 156 | help | 157 | help |
| 157 | Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring | 158 | Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring |
| 158 | time intervals (time, ping, traceroute etc need this). | 159 | time intervals (time, ping, traceroute etc need this). |