Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader

This commit is contained in:
Zach Eveland 2012-03-24 09:30:17 -04:00
commit dbdf2dadfa
1 changed files with 1 additions and 1 deletions

View File

@ -23,4 +23,4 @@ parallel.force=true
arduinoisp.name=Arduino as ISP
arduinoisp.communication=serial
arduinoisp.protocol=stk500v1
arduinoisp.speed=9600
arduinoisp.speed=19200