diff options
| author | Zach Eveland <zeveland@blacklabel-development.com> | 2011-10-27 09:32:27 -0400 |
|---|---|---|
| committer | Zach Eveland <zeveland@blacklabel-development.com> | 2011-10-27 09:32:27 -0400 |
| commit | 29cfd9e9fe12cc10fc8f4bae5c884c514ad95902 (patch) | |
| tree | bfb510ae9f7401ae7ea4958f07d016fe7b7148f7 /bootloaders/diskloader/src/USBDesc.h | |
| parent | c0a9e827c12565c375eb1992478eb005851c0053 (diff) | |
| parent | f9ed282a16a6ac89cbd8458cd174332d64d0428b (diff) | |
Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot
Conflicts:
app/src/processing/app/Editor.java
app/src/processing/app/Sketch.java
build/shared/examples/4.Communication/SerialCallResponse/SerialCallResponse.pde
build/shared/lib/theme/theme.txt
hardware/arduino/cores/arduino/HardwareSerial.h
hardware/arduino/cores/arduino/Print.cpp
hardware/arduino/cores/arduino/WString.h
hardware/arduino/variants/mega/pins_arduino.h
libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
libraries/Firmata/examples/EchoString/EchoString.ino
libraries/SD/File.cpp
libraries/SoftwareSerial/SoftwareSerial.cpp
libraries/SoftwareSerial/SoftwareSerial.h
libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
libraries/SoftwareSerial/keywords.txt
Diffstat (limited to 'bootloaders/diskloader/src/USBDesc.h')
0 files changed, 0 insertions, 0 deletions