diff options
| author | Zach Eveland <zeveland@blacklabel-development.com> | 2011-10-27 11:41:02 -0400 |
|---|---|---|
| committer | Zach Eveland <zeveland@blacklabel-development.com> | 2011-10-27 11:41:02 -0400 |
| commit | ec93cd74a187a58f0e2bbe496c38edd7d9f33f30 (patch) | |
| tree | 3e519cf239c57e915520e60563714dfd6f7948e0 /bootloaders/diskloader/src/USBDesc.h | |
| parent | 415a5e119d11394fc7e7365ff5b7c64a50ef7f64 (diff) | |
| parent | 5c9d10ad9484c26eb94d2030628b676f8d0d5fc7 (diff) | |
Merge branch 'new-extension' of github.com:arduino/Arduino into diskloader_reboot
Conflicts:
hardware/arduino/variants/mega/pins_arduino.h
libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
Diffstat (limited to 'bootloaders/diskloader/src/USBDesc.h')
0 files changed, 0 insertions, 0 deletions