Skip to content
Commit b3dc7133 authored by Radek Ošlejšek's avatar Radek Ošlejšek
Browse files

Merge branch 'master' into '159-accelerate-swapping' 

# Conflicts:
#   GUI/src/main/java/cz/fidentis/analyst/batch/BatchPanel.form
#   GUI/src/main/java/cz/fidentis/analyst/batch/BatchPanel.java
#   GUI/src/main/resources/cz/fidentis/analyst/batch/Bundle.properties
parents 8d58415a e24b2ea7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment