3 Commits

Author	SHA1	Message	Date
Zach Eveland	3524f2ff0b	Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot" ... This reverts commit df9835efafd13685251749bc210c0b96a18a96a5, reversing changes made to ec45af8bfa9222a807c075dd1db4b5aa798bba03. Conflicts: hardware/arduino/variants/mega/pins_arduino.h libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino	2011-10-27 11:45:13 -04:00
David A. Mellis	84285ab780	Disabling terminal / monitor.	2011-06-29 22:48:07 -04:00
David A. Mellis	e511065c6a	Adding the Mega 2560 bootloader and boards.txt / boards menu entry.	2010-09-24 10:10:57 -04:00