1d865de59a
Conflicts: build/shared/revisions.txt |
||
---|---|---|
bootloaders | ||
cores/arduino | ||
firmwares | ||
libraries/Wire | ||
variants | ||
boards.txt | ||
platform.txt | ||
programmers.txt |
1d865de59a
Conflicts: build/shared/revisions.txt |
||
---|---|---|
bootloaders | ||
cores/arduino | ||
firmwares | ||
libraries/Wire | ||
variants | ||
boards.txt | ||
platform.txt | ||
programmers.txt |