rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Code Issues Releases Activity
008818868c
Arduino/hardware
History
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
..
arduino Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery 2013-07-14 12:01:03 +02:00
tools Removed unused boards/programmers 2012-08-25 16:31:25 +02:00