rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-30 11:24:12 +01:00
Code Issues Releases Activity
23c7536dc7
Arduino/hardware/arduino/avr/bootloaders
History
Cristian Maglie 23c7536dc7 Merged 1.0.2 
Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/debug/AvrdudeUploader.java
	build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
	build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
	build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino
	build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino
	build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino
	hardware/arduino/boards.txt
2012-11-04 22:49:14 +01:00
..
atmega Created second level in hardware folder: hardware/PACKAGE/PLATFORM/... 2011-12-30 15:46:04 +01:00
atmega8 Created second level in hardware folder: hardware/PACKAGE/PLATFORM/... 2011-12-30 15:46:04 +01:00
bt Created second level in hardware folder: hardware/PACKAGE/PLATFORM/... 2011-12-30 15:46:04 +01:00
caterina Merged 1.0.2 2012-11-04 22:49:14 +01:00
caterina-LilyPadUSB Merged 1.0.2 2012-11-04 22:49:14 +01:00
lilypad Created second level in hardware folder: hardware/PACKAGE/PLATFORM/... 2011-12-30 15:46:04 +01:00
optiboot Created second level in hardware folder: hardware/PACKAGE/PLATFORM/... 2011-12-30 15:46:04 +01:00
stk500v2 Created second level in hardware folder: hardware/PACKAGE/PLATFORM/... 2011-12-30 15:46:04 +01:00