aboutsummaryrefslogtreecommitdiff
path: root/firmwares/arduino-usbdfu/Arduino-usbdfu.h
diff options
context:
space:
mode:
authorCristian Maglie <c.maglie@bug.st>2012-09-10 14:53:49 +0200
committerCristian Maglie <c.maglie@bug.st>2012-09-10 14:53:49 +0200
commitf14cff04e81cb928fcf1af46ab2a213853757d36 (patch)
treec720e71642ec097571bb8cf7fa9731d8bd6bc734 /firmwares/arduino-usbdfu/Arduino-usbdfu.h
parent936aaf58b4a74d5a78c6e0fffa4140a77a26afa4 (diff)
parentf201dab33e228e89394b0352d077504ff2391487 (diff)
Merge branch 'master' into upload-16u2
Conflicts: hardware/arduino/sam/cores/arduino/USB/CDC.cpp hardware/arduino/sam/cores/arduino/USB/USBCore.cpp
Diffstat (limited to 'firmwares/arduino-usbdfu/Arduino-usbdfu.h')
0 files changed, 0 insertions, 0 deletions