Просмотр исходного кода

Merge esp_flasher from https://github.com/xMasterX/all-the-plugins

# Conflicts:
#	esp_flasher/packedfws/blackmagic/blackmagic.bin
#	esp_flasher/packedfws/blackmagic/bootloader.bin
#	esp_flasher/packedfws/blackmagic/partition-table.bin
#	esp_flasher/packedfws/blackmagic/s2/blackmagic.bin
#	esp_flasher/packedfws/blackmagic/s2/bootloader.bin
#	esp_flasher/packedfws/blackmagic/s2/partition-table.bin
#	esp_flasher/packedfws/marauder/S2/esp32_marauder.flipper.bin
#	esp_flasher/resources/apps_data/esp_flasher/assets/blackmagic/s2/blackmagic.bin
#	esp_flasher/resources/apps_data/esp_flasher/assets/blackmagic/s2/bootloader.bin
#	esp_flasher/resources/apps_data/esp_flasher/assets/blackmagic/s2/partition-table.bin
#	esp_flasher/scenes/esp_flasher_scene_quick.c
Willy-JL 1 год назад
Родитель
Сommit
a1b5a7e967

Данные Diff недоступны.