Conflicts: hardware/arduino/sam/variants/arduino_due_x/linker_scripts/gcc/flash.ld |
||
---|---|---|
bootloaders | ||
cores/arduino | ||
firmwares | ||
libraries | ||
variants | ||
boards.txt | ||
platform.txt | ||
programmers.txt |
Conflicts: hardware/arduino/sam/variants/arduino_due_x/linker_scripts/gcc/flash.ld |
||
---|---|---|
bootloaders | ||
cores/arduino | ||
firmwares | ||
libraries | ||
variants | ||
boards.txt | ||
platform.txt | ||
programmers.txt |