Skip to content
Snippets Groups Projects
Commit 8a13af10 authored by Jérôme SEMETTE's avatar Jérôme SEMETTE
Browse files

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

Conflicts:
	hardware/arduino/samd/cores/arduino/validation/build_as6/test.atsuo
	hardware/arduino/samd/cores/validation/validation_core/build_as6/test.cppproj
	hardware/arduino/samd/cores/validation/validation_core/test.cpp
parents d9a6408a b6658c1b
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 992 additions and 219 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment