1
0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-20 14:54:31 +01:00
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
..
2013-05-11 14:37:25 +02:00
2013-05-11 14:37:25 +02:00
2013-05-29 18:30:36 +02:00
2013-05-29 18:30:36 +02:00
2013-04-03 13:51:04 +02:00
2013-05-11 14:37:25 +02:00
2013-07-08 15:09:09 +02:00
2013-05-29 18:30:36 +02:00
2013-05-11 14:37:25 +02:00
2013-04-03 13:51:04 +02:00