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 5d92c1ba8e Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
	build/shared/examples/01.Basics/Blink/Blink.ino
	build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
	build/shared/examples/10.StarterKit/p02_SpaceshipInterface/p02_SpaceshipInterface.ino
	hardware/arduino/cores/arduino/HardwareSerial.cpp
2014-05-23 21:04:47 +02:00
..
EEPROM Revert "EEPROM library to the new format" 2013-11-21 11:22:44 +01:00
SoftwareSerial Merge remote-tracking branch 'arduino/master' into ide-1.5.x 2014-05-23 21:04:47 +02:00
SPI Revert "SPI library to new format" 2013-11-21 15:05:36 +01:00
Wire Revert "Wire library to the 1.5 format" 2013-11-15 12:54:59 +01:00