mirror of
https://github.com/arduino/Arduino.git
synced 2025-04-04 21:25:20 +02:00
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