1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-05 16:24:12 +01:00
Commit Graph

3 Commits

Author SHA1 Message Date
Zach Eveland
a6a59f1783 Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot"
This reverts commit df9835efaf, reversing
changes made to ec45af8bfa.

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
c93fd746c4 Disabling terminal / monitor. 2011-06-29 22:48:07 -04:00
David A. Mellis
27109e3b1a Adding the Mega 2560 bootloader and boards.txt / boards menu entry. 2010-09-24 10:10:57 -04:00