diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2013-07-30 10:45:44 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2013-07-30 10:45:44 +0200 |
| commit | acb3df6d4398e1df2e350cd5e8f1d742bee97316 (patch) | |
| tree | e5e17a3863fbc97e6d4d93254670a9924df67c86 /bootloaders/stk500v2 | |
| parent | 1895d696b1fd11488e469fb17549263c24548d0d (diff) | |
| parent | 99bb4a573fa71a4e6c30cad144284d12b3f7edd0 (diff) | |
Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts:
hardware/arduino/avr/cores/arduino/USBCore.cpp
Diffstat (limited to 'bootloaders/stk500v2')
0 files changed, 0 insertions, 0 deletions