1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-11 22:24:13 +01:00
Arduino/libraries/Ethernet
Cristian Maglie 853be57648 Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
	libraries/Ethernet/examples/XivelyClient/XivelyClient.ino
	libraries/Ethernet/examples/XivelyClientString/XivelyClientString.ino
	libraries/GSM/examples/GSMXivelyClient/GSMXivelyClient.ino
	libraries/GSM/examples/GSMXivelyClientString/GSMXivelyClientString.ino
	libraries/Servo/examples/Knob/Knob.ino
	libraries/Servo/examples/Sweep/Sweep.ino
	libraries/WiFi/examples/WiFiXivelyClient/WiFiXivelyClient.ino
	libraries/WiFi/examples/WiFiXivelyClientString/WiFiXivelyClientString.ino
2013-11-11 12:40:59 +01:00
..
arch Fixed wrong behaviour of EthernetClient::flush(). 2013-09-23 15:46:51 +02:00
examples Merge remote-tracking branch 'arduino/master' into ide-1.5.x 2013-11-11 12:40:59 +01:00
src Fixed wrong behaviour of EthernetClient::flush(). 2013-09-23 15:46:51 +02:00
keywords.txt Ethernet, SD and LiquidCrystal to the new library format 2013-06-26 19:13:04 +02:00
library.properties Updated libraries metadata 2013-08-08 16:40:55 +02:00