Arduino/STK500V2.pnps at 1a305cdc458357a9692c7356ce3fb2b9f6b4a31f - Arduino - Rooty - Git Service

rooty/Arduino

mirror of https://github.com/arduino/Arduino.git synced 2024-11-30 11:24:12 +01:00

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

1 line

61 B

Plaintext

Raw Blame History

<pd><ViewState><e p="STK500V2" x="true"></e></ViewState></pd>