Commit 1e041c45 authored by Vít Hanousek's avatar Vít Hanousek
Browse files

Merge branch 'develop' into mpi 

Conflicts:
	CMakeLists.txt
	src/TNL/Meshes/CMakeLists.txt
	src/UnitTests/CMakeLists.txt
parents 2587db3a 1332b5d6
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