Skip to content
Snippets Groups Projects
Commit ecec13aa authored by Jean-Christophe BUDA's avatar Jean-Christophe BUDA
Browse files

Merge branch 'zero' of https://github.com/arduino/ArduinoZero into zero

Conflicts:
	hardware/arduino/samd/cores/arduino/USB/samd21_host.c
	hardware/arduino/samd/cores/validation/validation_usb_host/test_usb_host.cpp
parents 5a20d0a5 f4784162
No related branches found
No related tags found
Loading
Showing
with 122 additions and 138 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment