Skip to content
Snippets Groups Projects
Commit 8c3a8fcd authored by Mark Olesen's avatar Mark Olesen
Browse files

Merge remote branch 'OpenCFD/master' into olesenm 

Conflicts:
	tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allrun
	tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/README
	tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/thermophysicalProperties
	tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/fuels/propane.dat
	tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/controlDict
	tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSchemes
	tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSolution
parents 82ba4e54 16543937
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
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