1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-30 11:24:12 +01:00
Arduino/hardware/arduino/avr
Cristian Maglie ea8c14421a Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts:
	app/src/processing/app/Preferences.java
	app/src/processing/app/debug/Uploader.java
2013-08-23 15:59:24 +02:00
..
bootloaders updated Yun bootloader 2013-06-21 17:40:59 +02:00
cores/arduino Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery 2013-08-23 15:59:24 +02:00
firmwares Merged 1.0.5 2013-04-03 13:51:04 +02:00
libraries Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery 2013-08-23 15:59:24 +02:00
variants Updated robot examples and libraries 2013-08-22 16:30:28 +02:00
boards.txt Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery 2013-08-23 15:59:24 +02:00
platform.txt Added quoting to usb_producer key to preserve double quotes. 2013-08-01 15:20:24 +02:00
programmers.txt Set correct speed of Arduino ISP programmer 2013-04-06 01:59:25 +02:00