Cristian Maglie ea8c14421a Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery ... Conflicts: app/src/processing/app/Preferences.java app/src/processing/app/debug/Uploader.java		2013-08-23 15:59:24 +02:00
..
cmd	Importing Processing rev. 5503 (1.0.3).	2009-05-31 15:53:33 +00:00
javadoc	Importing Processing rev. 5503 (1.0.3).	2009-05-31 15:53:33 +00:00
linux	Merge branch 'update-arm-gcc' into ide-1.5.x	2013-08-08 15:00:14 +02:00
macosx	Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery	2013-08-23 15:59:24 +02:00
shared	Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery	2013-08-23 15:59:24 +02:00
windows	Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery	2013-08-23 15:59:24 +02:00
build.xml	Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery	2013-08-23 15:59:24 +02: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