1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-02 13:24:12 +01:00
Arduino/hardware/arduino/avr/bootloaders
Cristian Maglie 62b723357c Merged 1.0.5
Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/Base.java
	build/shared/revisions.txt
	hardware/arduino/avr/cores/arduino/malloc.c
	hardware/arduino/cores/arduino/avr-libc/malloc.c
	hardware/arduino/cores/arduino/malloc.c
	todo.txt
2013-04-03 13:51:04 +02:00
..
atmega fixed permissions on a lot of text files. see #1116 2012-12-10 10:42:49 +01:00
atmega8 Merged 1.0.3 2012-12-10 15:55:05 +01:00
bt fixed permissions on a lot of text files. see #1116 2012-12-10 10:42:49 +01:00
caterina Merged 1.0.3 2012-12-10 15:55:05 +01:00
caterina-LilyPadUSB fixed permissions on a lot of text files. see #1116 2012-12-10 10:42:49 +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 Merged 1.0.5 2013-04-03 13:51:04 +02:00