Skip to content

Commit 1286ade

Browse files
cmagliecmaglie
committed
Merge remote-tracking branch 'dog/ide-1.5.x-discovery' into ide-1.5.x-discovery
Conflicts: app/src/processing/app/Base.java app/src/processing/app/Editor.java
2 parents 0ff7371 + 2d74e67 commit 1286ade

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)