Commit 2c409282 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'master' into HEAD 

Conflicts:
	src/functors/CMakeLists.txt
	src/functors/tnlTestFunction_impl.h
	src/problems/tnlPDEProblem.h
parents cccf1e01 41091991
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