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

..

avr

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

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

sam

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

2013-05-21 09:18:04 +02:00