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

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

Conflicts:
	examples/heat-equation/heatEquationSolver.h
parents 424c93dc 2db00762
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