diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2012-11-04 22:49:14 +0100 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2012-11-04 22:49:14 +0100 |
| commit | 706f5c74b2bfc51e27ab283c4959b998008aeffc (patch) | |
| tree | 9e243b4582251be221ce7a4a5ee6609d5960659c /bootloaders/lilypad/src/ATmegaBOOT.c | |
| parent | 1408d931fe86a36adc9993823cd06442d85be8e0 (diff) | |
| parent | bb6569d0695eef174a190a4c0fd570deb55ecfc2 (diff) | |
Merged 1.0.2
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
app/src/processing/app/debug/AvrdudeUploader.java
build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino
build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino
build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino
hardware/arduino/boards.txt
Diffstat (limited to 'bootloaders/lilypad/src/ATmegaBOOT.c')
0 files changed, 0 insertions, 0 deletions