Cristian Maglie 23c7536dc7 Merged 1.0.2 ...

Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/debug/AvrdudeUploader.java
	build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
	build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
	build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino
	build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino
	build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino
	hardware/arduino/boards.txt

2012-11-04 22:49:14 +01:00

..

dist

Merged 1.0.2

2012-11-04 22:49:14 +01:00

launcher

Fixed eclipse project files

2012-01-11 13:59:39 +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