diff options
author | Cristian Maglie <c.maglie@bug.st> | 2012-10-18 15:50:09 +0200 |
---|---|---|
committer | Cristian Maglie <c.maglie@bug.st> | 2012-10-18 15:50:09 +0200 |
commit | 6a45ba48ab1f2d0a168373a02ba7fded40a3470e (patch) | |
tree | 163448869b4dfcbce95dc877ffff61a709fba6b6 /boards.txt | |
parent | c313b54c00635f1be14a1b09617dc9b8b562e589 (diff) | |
parent | 6d296e0faba5b9910084c307a3f93cb2653bf7f8 (diff) |
Merged upstream arduino branch
Diffstat (limited to 'boards.txt')
-rw-r--r-- | boards.txt | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -120,7 +120,7 @@ mega2560.cpu=2560 or ADK mega2560.container=Arduino Mega mega2560.upload.tool=avrdude -mega2560.upload.protocol=stk500v2 +mega2560.upload.protocol=wiring mega2560.upload.maximum_size=258048 mega2560.upload.speed=115200 |