diff options
author | Cristian Maglie <c.maglie@bug.st> | 2014-08-08 15:44:41 +0200 |
---|---|---|
committer | Cristian Maglie <c.maglie@bug.st> | 2014-08-08 15:44:41 +0200 |
commit | 5d87f9e8e2ee8e0a2028aec93dfe6951bd1c0c45 (patch) | |
tree | 8804134f8ba60b2e601311c0230bc69b7681785b /firmwares/atmegaxxu2/MEGA-dfu_and_usbserial_combined.hex | |
parent | 48f5256789369bd5a4d8d9b9a663982aea717c7d (diff) | |
parent | 28acfd7d9d59b37f0b1deef25be999d281c1231b (diff) |
Merge branch 'master' into ide-1.5.x
Diffstat (limited to 'firmwares/atmegaxxu2/MEGA-dfu_and_usbserial_combined.hex')
0 files changed, 0 insertions, 0 deletions