diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-06-28 10:27:15 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-06-28 10:27:15 +0100 |
| commit | b3a50f0f3e287d63fce274e29641a3bc57405d5d (patch) | |
| tree | 1db867d2e5c40d9cd530424c022768f6f282251f /unix/main.c | |
| parent | ed07d035d52764b3b02bfa8488f2e0445c28ea2f (diff) | |
| parent | 8993fb6cf0677ce980ab56cbad326e4e6bc47811 (diff) | |
| download | micropython-b3a50f0f3e287d63fce274e29641a3bc57405d5d.tar.gz micropython-b3a50f0f3e287d63fce274e29641a3bc57405d5d.zip | |
Merge branch 'master' into unicode
Conflicts:
py/mpconfig.h
Diffstat (limited to 'unix/main.c')
| -rw-r--r-- | unix/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/unix/main.c b/unix/main.c index a08661339c..23615aa988 100644 --- a/unix/main.c +++ b/unix/main.c @@ -265,7 +265,6 @@ void pre_process_options(int argc, char **argv) { #endif int main(int argc, char **argv) { - stack_ctrl_init(); stack_set_limit(32768); pre_process_options(argc, argv); |