769ca0d8f8
Conflicts: core/include/esp/rtc_regs.h include/espressif/spi_flash.h |
||
---|---|---|
.. | ||
esp | ||
common_macros.h | ||
esp8266.h | ||
flashchip.h | ||
os_version.h | ||
sdk_internal.h | ||
xtensa_ops.h |
769ca0d8f8
Conflicts: core/include/esp/rtc_regs.h include/espressif/spi_flash.h |
||
---|---|---|
.. | ||
esp | ||
common_macros.h | ||
esp8266.h | ||
flashchip.h | ||
os_version.h | ||
sdk_internal.h | ||
xtensa_ops.h |