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
..
BarometricPressureWebServer	Merge remote-tracking branch 'amcewen/wifly_integration' into new-extension	2011-08-31 14:25:04 -04:00
ChatServer	Merge remote-tracking branch 'amcewen/wifly_integration' into new-extension	2011-08-31 14:25:04 -04:00
DhcpAddressPrinter	Merge remote-tracking branch 'amcewen/wifly_integration' into new-extension	2011-08-31 14:25:04 -04:00
DhcpChatServer	Changed names of the Ethernet classes: Client -> EthernetClient, NetClient -> Client, and basic testing performed	2011-08-29 22:36:28 +01:00
DnsWebClient	Merge remote-tracking branch 'amcewen/wifly_integration' into new-extension	2011-08-31 14:25:04 -04:00
PachubeClient	Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot"	2011-10-27 11:45:13 -04:00
PachubeClientString	Modified Pachube examples to use manual Ethernet config if DCHP fails.	2011-10-26 13:22:30 -04:00
TelnetClient	Merge remote-tracking branch 'amcewen/wifly_integration' into new-extension	2011-08-31 14:25:04 -04:00
TwitterClient	Changed names of the Ethernet classes: Client -> EthernetClient, NetClient -> Client, and basic testing performed	2011-08-29 22:36:28 +01:00
UdpNtpClient	Merge remote-tracking branch 'amcewen/wifly_integration' into new-extension	2011-08-31 14:25:04 -04:00
UDPSendReceiveString	Merge remote-tracking branch 'amcewen/wifly_integration' into new-extension	2011-08-31 14:25:04 -04:00
WebClient	Merge remote-tracking branch 'amcewen/wifly_integration' into new-extension	2011-08-31 14:25:04 -04:00
WebServer	Merge remote-tracking branch 'amcewen/wifly_integration' into new-extension	2011-08-31 14:25:04 -04:00