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

5 Commits

Author SHA1 Message Date
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
Jaime Iniesta
9403021460 fix comments on spaceship example
The comments explaining the if..else part were mistaken.
2014-05-01 22:22:04 +02:00
Federico Fissore
b4c68b3dff Run new astyle formatter against all the examples 2013-10-21 09:58:40 +02:00
Scott
20c181470d Fixed issue in Starter kit example number 4 2012-11-14 16:07:38 -05:00
Scott
9fd14df549 Added Starter Kit examples 2012-10-12 13:23:48 -04:00