1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-10 21:24:12 +01:00
Arduino/hardware/arduino
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
..
avr Merged 1.0.5 2013-04-03 13:51:04 +02:00
bootloaders/stk500v2 Merged 1.0.5 2013-04-03 13:51:04 +02:00
sam [sam] Added serialEvent*() support 2013-03-25 01:29:42 +01:00