Skip to content
Commit 79eb8adb authored by Peter Čonga's avatar Peter Čonga
Browse files

Merge branch 'master' into 'revert-0c46a688' 

# Conflicts:
#   GUI/src/main/java/cz/fidentis/analyst/gui/task/batch/symmetry/BatchCurveRenderingPanel.java
#   GUI/src/main/java/cz/fidentis/analyst/gui/task/batch/symmetry/BatchCuttingPlanesAction.java
parents 8d1ab9b8 496d02f7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment