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

Merge commit 'OpenCFD/master' into merging

Conflicts:

	src/OpenFOAM/containers/misc/xferI.H
	src/OpenFOAM/fields/tmp/refCount.H
	src/OpenFOAM/memory/refCount/refCount.H
	src/OpenFOAM/memory/xfer/xferI.H
	src/finiteVolume/fvMesh/extendedStencil/extendedCentredStencil.C
	src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceEdgeCellStencil.H
parents 70a38319 1bc24ee3
Branches
Tags
Loading
Showing
with 991 additions and 184 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment