diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2014-05-23 21:04:47 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2014-05-23 21:04:47 +0200 |
| commit | 2d46a8ef88b5cb52d7d2660b97f7289981a7b32a (patch) | |
| tree | f58154e6492b6920e8cb6fe667bc3cf5e4af4633 /bootloaders/stk500v2 | |
| parent | 6d4273609b2f8d8c71ff30bda6e075f3d50e335a (diff) | |
| parent | c16768565b4ea62a06d21fa6d5cb0cbb0af902fa (diff) | |
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
build/shared/examples/01.Basics/Blink/Blink.ino
build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
build/shared/examples/10.StarterKit/p02_SpaceshipInterface/p02_SpaceshipInterface.ino
hardware/arduino/cores/arduino/HardwareSerial.cpp
Diffstat (limited to 'bootloaders/stk500v2')
0 files changed, 0 insertions, 0 deletions