Conflicts: hardware/arduino/cores/arduino/wiring.c libraries/Ethernet/src/utility/util.h libraries/Ethernet/src/utility/w5100.cpp libraries/Ethernet/src/utility/w5100.h libraries/Ethernet/util.h libraries/Ethernet/utility/util.h libraries/SPI/SPI.cpp libraries/SPI/SPI.h |
||
---|---|---|
bootloaders | ||
cores/arduino | ||
firmwares | ||
libraries | ||
variants | ||
boards.txt | ||
platform.txt | ||
programmers.txt |