Skip to content
Commit 9e00a0d3 authored by Vít Musil's avatar Vít Musil
Browse files

Merge branch 'devel' into experiment/window-mp 

# Conflicts:
#	tests/run_test.py
parents 3c439d50 d791c6c9
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