src/operators/tnlOperatorComposition.h · 69d3240a7411143deab29a308ea47ba811945838 · TNL / tnl-dev

Something went wrong on our end

9 years ago

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

Conflicts:
	src/functions/tnlOperatorFunction.h
	src/operators/tnlFunctionInverseOperator.h
	src/operators/tnlOperator.h
	src/operators/tnlOperatorComposition.h
	tests/unit-tests/operators/diffusion/CMakeLists.txt

4a647ea1

History

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

Tomáš Oberhuber authored 9 years ago

Conflicts:
	src/functions/tnlOperatorFunction.h
	src/operators/tnlFunctionInverseOperator.h
	src/operators/tnlOperator.h
	src/operators/tnlOperatorComposition.h
	tests/unit-tests/operators/diffusion/CMakeLists.txt