mirror of
https://github.com/arduino/Arduino.git
synced 2025-02-19 13:54:23 +01:00
Conflicts: app/src/processing/app/Preferences.java app/src/processing/app/debug/Uploader.java
Conflicts: app/src/processing/app/Preferences.java app/src/processing/app/debug/Uploader.java