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 /stmhal/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 'stmhal/main.c')
| -rw-r--r-- | stmhal/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/stmhal/main.c b/stmhal/main.c index 4e50daba41..9f48fbfd65 100644 --- a/stmhal/main.c +++ b/stmhal/main.c @@ -187,7 +187,6 @@ static const char fresh_readme_txt[] = int main(void) { // TODO disable JTAG - stack_ctrl_init(); // Stack limit should be less than real stack size, so we // had chance to recover from limit hit. stack_set_limit(&_ram_end - &_heap_end - 512); |