mirror of
https://github.com/arduino/Arduino.git
synced 2024-11-29 10:24:12 +01:00
23c7536dc7
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 |
||
---|---|---|
.. | ||
dist | ||
avr_tools_linux32.tar.bz2 | ||
avr_tools_linux64.tar.bz2 | ||
jre.tgz |