1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-02 13:24:12 +01:00
Arduino/hardware/arduino
Cristian Maglie d21f734357 Merge branch 'master' into upload-16u2
Conflicts:
	hardware/arduino/sam/cores/arduino/USB/CDC.cpp
	hardware/arduino/sam/cores/arduino/USB/USBCore.cpp
2012-09-10 14:53:49 +02:00
..
avr Upload over debug port 2012-09-07 15:59:44 +02:00
sam Merge branch 'master' into upload-16u2 2012-09-10 14:53:49 +02:00