Go to file
Cristian Maglie 706f5c74b2 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
bootloaders Updating Micro bootloader firmware. 2012-11-02 17:45:57 -04:00
cores/arduino Merged 1.0.2 2012-11-04 22:49:14 +01:00
firmwares Merge branch 'master' of ../wifishield 2012-09-13 10:42:25 -04:00
libraries Moved WiFi library in the proper place 2012-10-22 09:17:24 +02:00
variants Adding Micro. 2012-10-27 14:12:26 -04:00
boards.txt Merged 1.0.2 2012-11-04 22:49:14 +01:00
platform.txt Fixed verbose upload. Removed unused platform.txt params. 2012-11-04 01:05:54 +01:00
programmers.txt Upload/Program with configurable generic command line tools (wip) 2012-02-05 23:17:15 +01:00