From: Angus Gratton <angus@espressif.com>
Date: Fri, 13 Oct 2017 00:40:39 +0000 (+0800)
Subject: Merge branch 'bugfix/freertos_halt_on_startup' into 'master'
X-Git-Tag: v3.1-dev~183
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bad585b6b3c3062cfd6ba4b90c79113863c037af;p=esp-idf

Merge branch 'bugfix/freertos_halt_on_startup' into 'master'

freertos: Remove "stop program on scheduler start when JTAG/OCD is detected" option

See merge request !1354
---

bad585b6b3c3062cfd6ba4b90c79113863c037af