diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:15:08 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:15:08 +0000 |
| commit | c0d4367d6b581eb5989c02815880cf0fa2851ae8 (patch) | |
| tree | 868c266e627e2d7f65ba5a4d5f98a1c421453181 /libbb/messages.c | |
| parent | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (diff) | |
| parent | da4441c44f6efccb6f7b7588404d9c6bfb7b6af8 (diff) | |
| download | busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.tar.gz busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.tar.bz2 busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.zip | |
Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge
Conflicts:
libbb/vfork_daemon_rexec.c
networking/wget.c
procps/ps.c
Diffstat (limited to 'libbb/messages.c')
| -rw-r--r-- | libbb/messages.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/messages.c b/libbb/messages.c index 9e7bd0fef..ef42b30d7 100644 --- a/libbb/messages.c +++ b/libbb/messages.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | const char bb_banner[] ALIGN1 = BANNER; | 22 | const char bb_banner[] ALIGN1 = BANNER; |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | const char bb_msg_memory_exhausted[] ALIGN1 = "memory exhausted"; | 25 | const char bb_msg_memory_exhausted[] ALIGN1 = "out of memory"; |
| 26 | const char bb_msg_invalid_date[] ALIGN1 = "invalid date '%s'"; | 26 | const char bb_msg_invalid_date[] ALIGN1 = "invalid date '%s'"; |
| 27 | const char bb_msg_unknown[] ALIGN1 = "(unknown)"; | 27 | const char bb_msg_unknown[] ALIGN1 = "(unknown)"; |
| 28 | const char bb_msg_can_not_create_raw_socket[] ALIGN1 = "can't create raw socket"; | 28 | const char bb_msg_can_not_create_raw_socket[] ALIGN1 = "can't create raw socket"; |