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

..

avr

Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery

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

sam

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

2013-06-28 15:36:50 +02:00