diff options
author | Cristian Maglie <c.maglie@bug.st> | 2012-08-14 10:08:55 +0200 |
---|---|---|
committer | Cristian Maglie <c.maglie@bug.st> | 2012-08-14 10:08:55 +0200 |
commit | 25ec2a9f65fde6eddd9781c76a34dcf01598853b (patch) | |
tree | 37c7debb1d705d0b580bf9abeeb1f71cd45a1e8d /firmwares/arduino-usbserial/Descriptors.h | |
parent | c94c982c78fc083074a128ca41659edb8bbfb4d2 (diff) | |
parent | 0eb27ef3a5f660a00e7fb2b79da3d023400a2d0e (diff) |
Merge branch 'new-linker'
Conflicts:
hardware/arduino/sam/variants/arduino_due_x/linker_scripts/gcc/flash.ld
Diffstat (limited to 'firmwares/arduino-usbserial/Descriptors.h')
0 files changed, 0 insertions, 0 deletions