Skip to content
Commit 2250e28c authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'mhfem' into revisions

Conflicts:
	src/core/arrays/tnlStaticArray.h
	src/core/arrays/tnlStaticArray1D_impl.h
	src/core/arrays/tnlStaticArray2D_impl.h
	src/core/arrays/tnlStaticArray3D_impl.h
	src/core/arrays/tnlStaticArray_impl.h
	src/core/vectors/tnlSharedVector.h
	src/core/vectors/tnlStaticVector.h
	src/functions/tnlFunctionEnumerator_impl.h
	src/functions/tnlTestFunction.h
	src/solvers/linear/krylov/tnlGMRESSolver_impl.h
	src/solvers/linear/krylov/tnlTFQMRSolver_impl.h
	src/solvers/tnlSolverConfig_impl.h
	tools/src/tnl-cuda-arch.cu
parents b10b293b 48aade10
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