1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-02 13:24:12 +01:00
Arduino/build/shared
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
..
examples Merge remote-tracking branch 'arduino/master' into ide-1.5.x 2014-05-23 21:04:47 +02:00
icons Add icons 2013-12-07 19:39:45 +01:00
lib Merge branch 'master' into ide-1.5.x 2013-11-04 10:36:53 +01:00
tools Updated/corrected location of tool in sketchbook folder. 2013-03-18 13:42:09 +01:00
manpage.adoc Added command line option --verbose-build and --verbose-upload 2014-02-10 12:55:16 +01:00
reference.zip Including String and Stream methods in local reference. 2012-07-15 09:34:59 -04:00
revisions.txt Updated revisions.txt 2014-05-14 09:12:59 +02:00