diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2013-06-07 00:38:42 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2013-06-07 00:38:42 +0200 |
| commit | 514b18bb059f86a7e9f125c529befa914a1cde48 (patch) | |
| tree | 62f1c6e3fa69bc603e4ee746864bcf3587970481 /bootloaders/caterina-Arduino_Robot/Descriptors.h | |
| parent | 2f547367fd58582e6f820fbf0bd6a276288bbc4a (diff) | |
| parent | f25e5e94f7cd529fe57e1cbe94a9aafce94aaddf (diff) | |
Merge branch 'ide-1.5.x' into ide-1.5.x-discovery
Diffstat (limited to 'bootloaders/caterina-Arduino_Robot/Descriptors.h')
0 files changed, 0 insertions, 0 deletions