0f7a0ec4ed
Conflicts: hardware/arduino/cores/arduino/HardwareSerial.cpp hardware/arduino/cores/robot/Arduino.h |
||
---|---|---|
bootloaders | ||
cores/arduino | ||
firmwares | ||
libraries | ||
variants | ||
boards.txt | ||
platform.txt | ||
programmers.txt |