Commit 87c8be53 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.0' into v2.1 

Conflicts:
	src/vesselbase/ActionWithVessel.cpp
parents 708274a6 8f582df7
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