Commit 5884917b authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge remote-tracking branch 'origin/mean-curvature' into revisions 

Conflicts:
	src/functions/CMakeLists.txt
	src/functions/tnlTestFunction_impl.h
	src/problems/tnlHeatEquationProblem.h
	src/problems/tnlHeatEquationProblem_impl.h
parents 735da4f5 4ceb2249
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