]> granicus.if.org Git - esp-idf/commit
Merge branch 'feature/merge_flash_data_type-flash_partitions' into 'master'
authorAngus Gratton <angus@espressif.com>
Thu, 21 Mar 2019 05:40:40 +0000 (13:40 +0800)
committerAngus Gratton <angus@espressif.com>
Thu, 21 Mar 2019 05:40:40 +0000 (13:40 +0800)
commit25043c4d56dbef3d283f96252aa050ad3b9e77ee
tree3c9a19bc0609b68e50aa226f60d596591dfb4502
parent6d4a7b1a7ee41e4a78f8daae434f66a1fae6c4a0
parentfae39dc326c8bf0060a96a9233d9df8dba864e40
Merge branch 'feature/merge_flash_data_type-flash_partitions' into 'master'

merge esp_flash_data_types into esp_flash_partitions

See merge request idf/esp-idf!4504