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

Merge branch 'master' into develop

Conflicts:
	examples/advection/advection.h
	examples/advection/advectionRhs.h
	examples/inviscid-flow/2d/euler.h
	examples/inviscid-flow/2d/eulerRhs.h
	src/TNL/Functions/Analytic/SinBumps.h
	src/TNL/Functions/TestFunction.h
	src/TNL/Functions/TestFunction_impl.h
	src/TNL/Meshes/GridDetails/Grid1D.h
	src/TNL/Meshes/GridDetails/Grid1D_impl.h
	src/TNL/Meshes/GridDetails/Grid2D.h
	src/TNL/Meshes/GridDetails/Grid2D_impl.h
	src/TNL/Meshes/GridDetails/Grid3D.h
	src/TNL/Meshes/GridDetails/Grid3D_impl.h
	tests/benchmarks/heat-equation-benchmark/tnlTestGrid2D.h
parents 87d2d81d e1c81072
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