]> granicus.if.org Git - esp-idf/commit
Merge branch 'bugfix/OTA_and_flash_encryption_incompatible' into 'master'
authorIvan Grokhotkov <ivan@espressif.com>
Wed, 15 Feb 2017 05:24:10 +0000 (13:24 +0800)
committerIvan Grokhotkov <ivan@espressif.com>
Wed, 15 Feb 2017 05:24:10 +0000 (13:24 +0800)
commit25f05bef719b60135aa4a92e0e168b23035eaa52
treeba6b68e200bceea56c67542da51ca1d4af1e4eee
parenta65944a8cb0e0099a46ff20c90bad6c0f45ddc30
parent2d5162dc3c375332657264b39f13e4031e7a8765
Merge branch 'bugfix/OTA_and_flash_encryption_incompatible' into 'master'

bootloader_support: fix bug OTA & flash encryption incompatible

github issue:https://github.com/espressif/esp-idf/issues/253

See merge request !464