]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a65944a 2d5162d)
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)
bootloader_support: fix bug OTA & flash encryption incompatible

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

See merge request !464


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.