rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-02 13:24:12 +01:00
Code Issues Releases Activity
ea8c14421a
Arduino/app/src
History
Cristian Maglie ea8c14421a Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery 
Conflicts:
	app/src/processing/app/Preferences.java
	app/src/processing/app/debug/Uploader.java
2013-08-23 15:59:24 +02:00
..
cc/arduino/packages Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery 2013-08-23 15:59:24 +02:00
processing/app Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery 2013-08-23 15:59:24 +02:00