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

..

arduino

Merge branch 'master' into ide-1.5.x

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

tools

Removed unused boards/programmers

2012-08-25 16:31:25 +02:00