diff options
author | Cristian Maglie <c.maglie@bug.st> | 2013-01-27 12:52:06 +0100 |
---|---|---|
committer | Cristian Maglie <c.maglie@bug.st> | 2013-01-27 12:52:06 +0100 |
commit | 76d436f51501bd47ff463b88a196f517191f58ad (patch) | |
tree | 1f22ba2385ad22eca306d67793c0827451f2b50a /bootloaders/caterina/Descriptors.c | |
parent | bb9cc4f70c17eed497ab30d7bfe6eebb35055205 (diff) | |
parent | c6287dd6ac33544179a6544b8f3f55a396ec6608 (diff) |
Merge branch 'ide-1.5.x' into can
Diffstat (limited to 'bootloaders/caterina/Descriptors.c')
0 files changed, 0 insertions, 0 deletions