1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-30 11:24:12 +01:00
Arduino/hardware/arduino/avr/libraries
Cristian Maglie 008818868c Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts:
	app/src/cc/arduino/packages/uploaders/SerialUploader.java
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	app/src/processing/app/debug/Uploader.java
2013-07-14 12:01:03 +02:00
..
Bridge File: implemented File.openNextFile() and File.rewindDirectory() 2013-07-11 18:14:49 +02:00
EEPROM fixed permissions on a lot of text files. see #1116 2012-12-10 10:42:49 +01:00
Esplora Merged upcoming 1.0.4 and updated revision log 2013-01-06 18:38:03 +01:00
Ethernet Merged 1.0.5 2013-05-11 14:37:25 +02:00
Firmata wrong comment in Firmata.cpp. closes #786 #785 2013-01-10 14:53:20 +01:00
GSM Merged 1.0.5 2013-05-11 14:37:25 +02:00
Robot_Control Merged 1.0.5 2013-05-29 18:30:36 +02:00
Robot_Motor Merged 1.0.5 2013-05-29 18:30:36 +02:00
Servo Merged 1.0.5 2013-04-03 13:51:04 +02:00
SoftwareSerial Merge branch 'master' into ide-1.5.x 2013-07-14 11:51:50 +02:00
SPI Merged 1.0.5 2013-05-11 14:37:25 +02:00
Stepper Merge of arduino-1.0.1. Work in progress... 2012-05-23 09:22:52 +02:00
Temboo updated temboo examples 2013-07-08 15:09:09 +02:00
TFT Merged 1.0.5 2013-05-29 18:30:36 +02:00
WiFi Merged 1.0.5 2013-05-11 14:37:25 +02:00
Wire Merged 1.0.5 2013-04-03 13:51:04 +02:00