Cristian Maglie 44bcd2040b Merge branch 'master' into ide-1.5.x ...

Conflicts:
	app/src/processing/app/Base.java
	build/build.xml
	todo.txt

2014-09-16 12:19:39 +02:00

..

avr

Merge branch 'master' into ide-1.5.x

2014-09-16 12:19:39 +02:00

sam

Merge pull request #2299 from cmaglie/ide-1.5.x-spi-updates

2014-09-12 14:07:03 +02:00