Commit a72bda48 authored by Jan Schäfer's avatar Jan Schäfer
Browse files

Pokus c.2

jen namergovano, upravy pozdeji
Merge branch 'develop' into euler

Conflicts:
	examples/advection/advection.h
	examples/advection/advectionProblem.h
	examples/advection/advectionProblem_impl.h
	examples/inviscid-flow/1d/euler.h
	examples/inviscid-flow/1d/eulerProblem_impl.h
	examples/inviscid-flow/2d/EulerPressureGetter.h
	examples/inviscid-flow/2d/EulerPressureGetter_impl.h
	examples/inviscid-flow/2d/EulerVelGetter.h
	examples/inviscid-flow/2d/EulerVelGetter_impl.h
	examples/inviscid-flow/2d/EulerVelXGetter.h
	examples/inviscid-flow/2d/EulerVelXGetter_impl.h
	examples/inviscid-flow/2d/EulerVelYGetter.h
	examples/inviscid-flow/2d/EulerVelYGetter_impl.h
	examples/inviscid-flow/2d/euler.h
	examples/inviscid-flow/2d/eulerBuildConfigTag.h
	examples/inviscid-flow/2d/eulerProblem.h
	examples/inviscid-flow/2d/eulerProblem_impl.h
parents 5c7473e8 b47ab28c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment