1
0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-30 19:52:13 +01:00
Cristian Maglie 0b632dba47 Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts:
	hardware/arduino/avr/cores/arduino/USBCore.cpp
2013-07-30 10:45:44 +02:00
..