aboutsummaryrefslogtreecommitdiff
path: root/bootloaders/caterina/Descriptors.c
diff options
context:
space:
mode:
authorCristian Maglie <c.maglie@bug.st>2013-07-14 12:01:03 +0200
committerCristian Maglie <c.maglie@bug.st>2013-07-14 12:01:03 +0200
commit5836db3ddb6fa757169aede51395b7e39669ff4c (patch)
treecb76a6f7aa51b7742a627c73c4bb5f62fb7c1de5 /bootloaders/caterina/Descriptors.c
parentbd1e2ab33250588b33038ab0e9a57437ed1d6e98 (diff)
parent77678f3af1b667b21ee4bf6f62ed233735d68d1a (diff)
Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts: app/src/cc/arduino/packages/uploaders/SerialUploader.java app/src/processing/app/Editor.java app/src/processing/app/Sketch.java app/src/processing/app/debug/Uploader.java
Diffstat (limited to 'bootloaders/caterina/Descriptors.c')
0 files changed, 0 insertions, 0 deletions