1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Arduino/build/linux
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
avr_tools_linux32.tar.bz2 Adding 32-bit version of AVR toolchain on Linux (Paul Stoffregen) 2012-02-28 14:50:28 -05:00
avr_tools_linux64.tar.bz2 Adding 64-bit version of AVR tools on Linux (Paul Stoffregen) 2012-02-28 15:24:03 -05:00
jre.tgz Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00