Skip to content
Commit 430c9de7 authored by Vít Musil's avatar Vít Musil
Browse files

Merge branch 'devel' into experiment/window-mp 

# Conflicts:
#	regstar/launch/experiment.py
parents 2155409e a1713a30
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