Commit 5b295f52 authored by Vít Hanousek's avatar Vít Hanousek
Browse files

Merge branch 'mpi-new' into MPI-explosive 

Conflicts:
	src/TNL/Meshes/DistributedMeshes/DistributedGridIO.h
	src/Tools/tnl-init.h
	src/UnitTests/Mpi/DistributedGridIOTest.h
	tests/mpi/CMakeLists.txt
parents 12fbb34d b6b7fd74
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