From: Angus Gratton <angus@espressif.com>
Date: Mon, 20 May 2019 05:58:03 +0000 (+0800)
Subject: Merge branch 'bugfix/custom_bootloader_subproject_build' into 'master'
X-Git-Tag: v4.0-beta1~326
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=826acbc3de98fdc483e68fc4a5db97fafa90110a;p=esp-idf

Merge branch 'bugfix/custom_bootloader_subproject_build' into 'master'

CMake: Fix custom bootloader does not override original

See merge request idf/esp-idf!5000
---

826acbc3de98fdc483e68fc4a5db97fafa90110a