Commit graph

2 commits

Author SHA1 Message Date
ladyada
af9e214f6b Merge remote-tracking branch 'upstream/master'
Conflicts:
	README.md
	boards.txt
	cores/arduino/USB/USBCore.cpp
	platform.txt
	variants/arduino_zero/variant.cpp
2017-01-15 17:17:21 -05:00
Martino Facchin
dac2df4299 Import Arduino.org boards variant 2016-12-20 14:46:52 +01:00