Cristian Maglie 008818868c Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery ...

Conflicts:
	app/src/cc/arduino/packages/uploaders/SerialUploader.java
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	app/src/processing/app/debug/Uploader.java

2013-07-14 12:01:03 +02:00

..

examples

Merge branch 'master' into ide-1.5.x

2013-07-14 11:51:50 +02:00

lib

added some String methods syntax highlighting

2013-07-03 09:03:17 +02:00

tools

Updated/corrected location of tool in sketchbook folder.

2013-03-18 13:42:09 +01:00

reference.zip

Including String and Stream methods in local reference.

2012-07-15 09:34:59 -04:00

revisions.txt

assembly compile recipe is missing (C. A. Church)

2013-07-12 21:09:45 +02:00