1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-13 23:48:46 +01:00
Arduino/build/shared/examples
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
..
01.Basics Merge remote-tracking branch 'arduino/master' into ide-1.5.x 2014-05-23 21:04:47 +02:00
02.Digital Merge branch 'master' into ide-1.5.x 2013-11-12 09:45:56 +01:00
03.Analog Run new astyle formatter against all the examples 2013-10-21 09:58:40 +02:00
04.Communication Merge remote-tracking branch 'arduino/master' into ide-1.5.x 2014-02-05 15:58:30 +01:00
05.Control Run new astyle formatter against all the examples 2013-10-21 09:58:40 +02:00
06.Sensors Run new astyle formatter against all the examples 2013-10-21 09:58:40 +02:00
07.Display Run new astyle formatter against all the examples 2013-10-21 09:58:40 +02:00
08.Strings Merge branch 'master' into ide-1.5.x 2014-04-07 19:14:13 +02:00
09.USB Merge remote-tracking branch 'arduino/master' into ide-1.5.x 2014-05-23 21:04:47 +02:00
10.StarterKit Merge remote-tracking branch 'arduino/master' into ide-1.5.x 2014-05-23 21:04:47 +02:00
ArduinoISP Run new astyle formatter against all the examples 2013-10-21 09:58:40 +02:00