diff options
| author | tigoe <tom.igoe@gmail.com> | 2013-05-30 23:11:13 -0400 |
|---|---|---|
| committer | tigoe <tom.igoe@gmail.com> | 2013-05-30 23:11:13 -0400 |
| commit | a027a1546d253d1503396e127ec45f0d71dee1c8 (patch) | |
| tree | 50caf9cd88603346761a3ab4ed392f2d93a3ad50 /firmwares/atmegaxxu2/Arduino-COMBINED-dfu-usbserial-atmega16u2-MegaADK-Rev3.hex | |
| parent | 0b4ab151fe8b7e96431629f272828ed99ca94dd4 (diff) | |
| parent | 13c2ed8e9a7440d91308aac6aacaa0677dff554d (diff) | |
Merge branch 'ide-1.5.x-discovery' of https://github.com/arduino/DogStick into ide-1.5.x-discovery
Conflicts:
hardware/arduino/avr/libraries/Bridge/examples/YunSerialTerminal/YunSeri
alTerminal.ino
Diffstat (limited to 'firmwares/atmegaxxu2/Arduino-COMBINED-dfu-usbserial-atmega16u2-MegaADK-Rev3.hex')
0 files changed, 0 insertions, 0 deletions