4 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
Tom Igoe	d16eeb0af3	Modified Pachube examples to use manual Ethernet config if DCHP fails.	2011-10-26 13:22:30 -04:00
David A. Mellis	da5ccf4eaf	Merge remote-tracking branch 'amcewen/wifly_integration' into new-extension	2011-08-31 14:25:04 -04:00
Tom Igoe	35777612c0	Changed all .pde examples to .ino ... All examples in /build/shared/examples/ and /libraries/ have had their extensions changed to .ino	2011-08-30 15:33:32 -04:00