Commit 96ab7c2d authored by Vít Hanousek's avatar Vít Hanousek
Browse files

Merge remote-tracking branch 'geraldine/mpi-explosive' into mpi-explosive 

Conflicts:
	src/TNL/Meshes/DistributedMeshes/DistributedGrid_1D.h
	src/TNL/Meshes/DistributedMeshes/DistributedGrid_2D.h
	src/TNL/Meshes/DistributedMeshes/DistributedGrid_3D.h
parents 66107cdf 8a1d5730
Expand all 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