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
..
cmd	Importing Processing rev. 5503 (1.0.3).	2009-05-31 15:53:33 +00:00
javadoc	jssc: updated config files (eclipse, ant build.xml, windows launcher, mac template.app), removed rxtx binaries	2013-11-28 17:27:13 +01:00
linux	Removed useless hidden files	2014-02-27 14:21:48 +01:00
macosx	Fixed macosx app template to reflect jssc update	2014-01-29 16:40:49 +01:00
shared	Merge remote-tracking branch 'arduino/master' into ide-1.5.x	2014-05-23 21:04:47 +02:00
windows	Windows: launch4j gets downloaded at build time	2014-03-04 13:13:48 +01:00
build.xml	Fixed build.xml leftovers after last merge	2014-03-17 10:31:20 +01:00
create_reference.pl	Including String and Stream methods in local reference.	2012-07-15 09:34:59 -04:00
fetch.sh	Updating reference (and reference-fetching scripts).	2010-12-23 19:08:09 -06:00
howto.txt	fixed permissions on a lot of text files. see #1116	2012-12-10 10:42:49 +01:00