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

Merge branch 'diffusion' of ssh://geraldine.fjfi.cvut.cz:2222/local/projects/tnl/tnl into diffusion 

Conflicts:
	tests/unit-tests/tnlApproximationError_impl.h
parents 90dfc4e2 560dacc0
Hide whitespace changes
Inline Side-by-side
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