Skip to content
Snippets Groups Projects
user avatar
Jonathan BAUDIN authored
Conflicts:
	hardware/arduino/samd/cores/arduino/Arduino.h
	hardware/arduino/samd/cores/arduino/validation/build_gcc/debug_arduino_zero/IPAddress.o
	hardware/arduino/samd/cores/arduino/validation/build_gcc/debug_arduino_zero/Print.o
	hardware/arduino/samd/cores/arduino/validation/build_gcc/debug_arduino_zero/Reset.o
	hardware/arduino/samd/cores/arduino/validation/build_gcc/debug_arduino_zero/delay.o
	hardware/arduino/samd/cores/arduino/validation/build_gcc/debug_arduino_zero/main.o
	hardware/arduino/samd/cores/arduino/validation/build_gcc/debug_arduino_zero/startup.o
	hardware/arduino/samd/cores/arduino/validation/build_gcc/debug_arduino_zero/test.o
	hardware/arduino/samd/cores/arduino/validation/build_gcc/debug_arduino_zero/wiring.o
	hardware/arduino/samd/cores/arduino/validation/build_gcc/debug_arduino_zero/wiring_shift.o
f0bb6fc4
History