3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-07-24 15:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'remotes/upstream/Development' into Development

Browse source
This commit is contained in:
domonoky 2015-03-02 17:52:12 +01:00
commit 4a7aca2736
26 changed files with 2313 additions and 2826 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ArduinoAddons/Arduino_1.5.x/hardware/marlin/avr/boards.txt
View file

@ -33,7 +33,7 @@ rambo.build.variant=rambo
########################################
sanguino.name=Sanguino
sanguino.upload.tool=ardunio:avrdude
sanguino.upload.tool=arduino:avrdude
sanguino.upload.protocol=stk500
sanguino.upload.maximum_size=131072
sanguino.upload.speed=57600