Commit graph

1 commit

Author SHA1 Message Date
Henrik Rusche
09a06be1a4 Merge branch 'nextRelease' into feature/fullyIntegratedRealGasThermo
Conflicts:
	src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
	src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C
	src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnthalpy/mixedEnthalpyFvPatchScalarField.C
2016-05-31 14:30:51 +02:00