Cristian Maglie b4852f353c Merge remote-tracking branch 'dog/ide-1.5.x-discovery' into ide-1.5.x-discovery ...

Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java

2013-06-04 19:33:38 +02:00

..

arduino

Merge remote-tracking branch 'dog/ide-1.5.x-discovery' into ide-1.5.x-discovery

2013-06-04 19:33:38 +02:00

tools

Removed unused boards/programmers

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