Cristian Maglie 738b9d8e29 Merge remote-tracking branch 'arduino/master' into ide-1.5.x ...

Conflicts:
	.gitignore
	app/lib/commons-logging-1.0.4.jar
	build/build.xml
	build/windows/launcher/config_debug.xml
	libraries/Esplora/examples/Beginners/EsploraJoystickMouse/EsploraJoystickMouse.ino

2014-03-16 12:11:19 +01:00

..

.settings

Fixed eclipse project files

2012-01-11 13:59:39 +01:00

format

fixed java 1.5 compatibility issue

2012-12-04 11:54:19 +01:00

lib

Update to jssc 2.8.0

2014-01-27 16:06:55 +01:00

src

Merge remote-tracking branch 'arduino/master' into ide-1.5.x

2014-03-16 12:11:19 +01:00

test

Fixed typo in test

2014-02-06 10:21:54 +01:00

test-lib

added files that state third party licenses

2013-08-28 10:12:33 +02:00

.classpath

jssc: updated config files (eclipse, ant build.xml, windows launcher, mac template.app), removed rxtx binaries

2013-11-28 17:27:13 +01:00

.classpath_macosx

Importing Processing rev. 5503 (1.0.3).

2009-05-31 15:53:33 +00:00

.classpath_vista

fixed permissions on a lot of text files. see #1116

2012-12-10 10:42:49 +01:00

.project

Importing Processing rev. 5503 (1.0.3).

2009-05-31 15:53:33 +00:00

build.xml

Forgot to include .ino files as test resource

2013-10-22 17:51:54 +02:00

run-linux.launch

jssc: updated config files (eclipse, ant build.xml, windows launcher, mac template.app), removed rxtx binaries

2013-11-28 17:27:13 +01:00