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 |
|