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

Merge commit 'bundle/home' into olesenm 

Conflicts:
	src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C
	src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.H
	tutorials/incompressible/simpleFoam/airFoil2D/Allclean
	tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
parents d8cf3901 b54f89ac
Hide whitespace changes
Inline Side-by-side
Showing
with 98 additions and 1 deletion
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