Skip to content
Snippets Groups Projects
Commit 72c3da08 authored by laurence's avatar laurence
Browse files

Merge branch 'master' into feature/cvMesh 

Conflicts:
	applications/test/Matrix/Test-Matrix.C
	applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
	applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
	src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
	src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
parents 7964ebe6 b07e4f55
Branches
Hide whitespace changes
Inline Side-by-side
Showing
with 386 additions and 48 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