Merge branch 'merge-foundation' of... (5db9f70c) · Commits · Development / OpenFOAM-plus

This is an archived project. Repository and other project resources are read-only.

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.

Commit 5db9f70c authored 8 years ago by

mattijs

Browse files

Merge branch 'merge-foundation' of...

Merge branch 'merge-foundation' of develop.openfoam.com:Development/OpenFOAM-plus into merge-foundation

Conflicts:
	src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C

parents cba60be4 2025a2eb

Hide whitespace changes

Inline Side-by-side

Showing with 37 additions and 26 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment

Admin message

Merge branch 'merge-foundation' of...

Some changes are not shown.