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

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

Conflicts:
	examples/navier-stokes/navierStokesBoundaryConditions_impl.h
	src/implementation/mesh/tnlGrid1D_impl.h
	src/implementation/solvers/cfd/navier-stokes/tnlNavierStokesSolver_impl.h
	src/mesh/tnlGrid.h
parents 89de06e2 bae1e6fc
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