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
..
dist	Merged 1.0.5	2013-04-03 13:51:04 +02:00
launcher	Revert "removing old rxtx references"	2013-02-27 17:54:48 +01:00
avr_tools.zip	Updating to avrdude 5.11 (Windows). stk500 -> arduino in boards.txt.	2011-09-02 19:57:29 -04:00
bossac.exe	Updated bossac	2012-10-10 19:06:34 +02:00
eeprom.h	Fixing same eeprom.h problem on Windows.	2011-09-28 17:23:44 -04:00
jre.zip	Updating to Java 6u16 (from Processing rev. 5883).	2009-12-27 01:04:16 +00:00