Merge commit 'OpenCFD/master' into merging (cd6e34c8) · Commits · Development / openfoam

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Site will likely be offline for maintenance 14/15 April - more details soon

Commit cd6e34c8 authored 16 years ago by

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

Admin message

Admin message

Merge commit 'OpenCFD/master' into merging