mirror of
https://github.com/arduino/Arduino.git
synced 2024-12-01 12:24:14 +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 |
||
---|---|---|
.. | ||
FTDI USB Drivers | ||
Arduino Due Programming Port.inf | ||
Arduino Due.inf | ||
Arduino Leonardo.inf | ||
Arduino MEGA 2560 REV3.inf | ||
Arduino MEGA 2560.inf | ||
Arduino Mega ADK REV3.inf | ||
Arduino Mega ADK.inf | ||
Arduino Micro.inf | ||
Arduino UNO REV3.inf | ||
Arduino UNO.inf | ||
Arduino USBSerial.inf | ||
bossa.inf | ||
LilyPadUSB.inf |