Skip to content
Commit 5da8785d authored by Vít Hanousek's avatar Vít Hanousek
Browse files

Merge branch 'mpi' into mpi-explosive 

Conflicts:
	src/TNL/Solvers/MeshTypeResolver.h
	src/TNL/Solvers/MeshTypeResolver_impl.h
	src/TNL/Solvers/PDE/TimeDependentPDESolver_impl.h
	src/TNL/Solvers/SolverInitiator.h
	src/TNL/Solvers/SolverInitiator_impl.h
parents e4474270 acf5333f
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