Skip to content

BugFix for Duplicate Library Conflicts. #5126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
diwi wants to merge 5 commits into
base: master
Choose a base branch
from
Open

BugFix for Duplicate Library Conflicts. #5126

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6db08f
BugFix for Duplicate Library Conflicts.
diwi Jun 12, 2017
bd28b4b
Merge branch 'master' into bugfix-duplicateLibraryConflict
diwi Jun 17, 2017
eb6bd56
.
diwi Jun 19, 2017
ef5ae2b
Merge branch 'master' of https://github.com/processing/processing int…
diwi Jun 24, 2017
f1b103e
Merge branch 'master' of https://github.com/processing/processing int…
diwi Jul 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' of https://github.com/processing/processing int… 
…o bugfix-duplicateLibraryConflict

# Conflicts:
#	java/src/processing/mode/java/JavaBuild.java
  • Loading branch information
@diwi
diwi committed Jul 20, 2017
commit f1b103eddd5c79850c88a794c9225da85e0aab14
2 changes: 1 addition & 1 deletion java/src/processing/mode/java/JavaBuild.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
import processing.core.PConstants;
import processing.data.StringList;
import processing.data.XML;
import processing.mode.java.pdex.ImportStatement;
import processing.mode.java.pdex.SourceUtils;
import processing.mode.java.preproc.PdePreprocessor;
import processing.mode.java.preproc.PreprocessorResult;
import processing.mode.java.preproc.SurfaceInfo;
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.