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

2 Commits

Author SHA1 Message Date
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
Scott Fitzgerald
cb9686dc33 Updates to a number of Examples
removed pachube examples, added xively examples. changes to the Servo
examples
2013-11-08 18:46:27 +04:00