]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 426bb08 234de8d)
Merge branch 'feature/allow_components_to_declare_images_to_flash' into 'master'
authorAngus Gratton <angus@espressif.com>
Fri, 22 Mar 2019 03:14:37 +0000 (11:14 +0800)
committerAngus Gratton <angus@espressif.com>
Fri, 22 Mar 2019 03:14:37 +0000 (11:14 +0800)
Allow components to present their own images to flash

See merge request idf/esp-idf!4148

1  2 
components/esp32/CMakeLists.txt patch | diff1 | diff2 | blob | history
components/esptool_py/project_include.cmake patch | diff1 | diff2 | blob | history

diff --cc components/esp32/CMakeLists.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.