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

Merge branch 'revisions' of geraldine.fjfi.cvut.cz:/local/projects/tnl/tnl into revisions

Conflicts:
	src/functions/tnlOperatorFunction.h
	src/operators/tnlFunctionInverseOperator.h
	src/operators/tnlOperator.h
	src/operators/tnlOperatorComposition.h
	tests/unit-tests/operators/diffusion/CMakeLists.txt
parents fcfcea32 dbb56ebf
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