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
62b723357c
Arduino/hardware/arduino/avr
History
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
..
bootloaders Merged 1.0.5 2013-04-03 13:51:04 +02:00
cores/arduino Merged 1.0.5 2013-04-03 13:51:04 +02:00
firmwares Merged 1.0.5 2013-04-03 13:51:04 +02:00
libraries Merged 1.0.5 2013-04-03 13:51:04 +02:00
variants Merged 1.0.3 2012-12-10 15:55:05 +01:00
boards.txt merging ide-1.5.x 2013-02-13 16:25:40 +01:00
platform.txt BOARDS and ARCH defines from boards.txt 2013-02-11 19:43:04 +01:00
programmers.txt Upload/Program with configurable generic command line tools (wip) 2012-02-05 23:17:15 +01:00