mirror of https://github.com/noisymime/Arduino.git
Merge branch 'master' into ide-1.5.x
Conflicts: app/src/processing/app/Base.java
This commit is contained in:
commit
4e334b2e96
Conflicts: app/src/processing/app/Base.java