aboutsummaryrefslogtreecommitdiff
path: root/shell/ash.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-09-14 12:19:25 +1000
committerNguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-09-14 12:19:25 +1000
commit29ab9e37d0dc05dc6e302437106800bf62748b05 (patch)
tree9a790b0af6db8e474c83f15748d770cc320eb449 /shell/ash.c
parent38a1e6da34ffe9f0c6cdb8661b263eb80d72981f (diff)
parent599ae1eb9f20b4731735e14f9bac6371ad89b6d7 (diff)
downloadbusybox-w32-29ab9e37d0dc05dc6e302437106800bf62748b05.tar.gz
busybox-w32-29ab9e37d0dc05dc6e302437106800bf62748b05.tar.bz2
busybox-w32-29ab9e37d0dc05dc6e302437106800bf62748b05.zip
Merge branch 'origin/master' (early part)
Conflicts: shell/builtin_ulimit.c
Diffstat (limited to 'shell/ash.c')
-rw-r--r--shell/ash.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c
index ef2121885..d6838f82c 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -62,8 +62,6 @@
62#include <fnmatch.h> 62#include <fnmatch.h>
63 63
64#include "shell_common.h" 64#include "shell_common.h"
65#include "builtin_read.h"
66#include "builtin_ulimit.h"
67#include "math.h" 65#include "math.h"
68#if ENABLE_ASH_RANDOM_SUPPORT 66#if ENABLE_ASH_RANDOM_SUPPORT
69# include "random.h" 67# include "random.h"