GIT: Resolve conflict on merge from upstream (3cab2b60) · Commits · Development / openfoam

Commit 3cab2b60 authored 9 years ago by

Andrew Heather

Browse files

GIT: Resolve conflict on merge from upstream

parents de42f4f5 0483f8c4

Branches

Tags

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict 22 additions, 5 deletions

...utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
applications/utilities/mesh/manipulation/checkMesh/Make/files 1 addition, 1 deletion

...ications/utilities/mesh/manipulation/checkMesh/Make/files
applications/utilities/mesh/manipulation/checkMesh/Make/options 4 additions, 0 deletions

...ations/utilities/mesh/manipulation/checkMesh/Make/options
applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C 68 additions, 1 deletion

...ons/utilities/mesh/manipulation/checkMesh/checkGeometry.C
applications/utilities/mesh/manipulation/checkMesh/checkGeometry.H 7 additions, 1 deletion

...ons/utilities/mesh/manipulation/checkMesh/checkGeometry.H
applications/utilities/mesh/manipulation/checkMesh/checkMesh.C 40 additions, 8 deletions

...cations/utilities/mesh/manipulation/checkMesh/checkMesh.C
applications/utilities/mesh/manipulation/checkMesh/checkMeshQuality.C 8 additions, 2 deletions

.../utilities/mesh/manipulation/checkMesh/checkMeshQuality.C
applications/utilities/mesh/manipulation/checkMesh/checkMeshQuality.H 8 additions, 1 deletion

.../utilities/mesh/manipulation/checkMesh/checkMeshQuality.H
applications/utilities/mesh/manipulation/checkMesh/checkTools.C 397 additions, 0 deletions

...ations/utilities/mesh/manipulation/checkMesh/checkTools.C
applications/utilities/mesh/manipulation/checkMesh/checkTools.H 19 additions, 0 deletions

...ations/utilities/mesh/manipulation/checkMesh/checkTools.H
applications/utilities/mesh/manipulation/checkMesh/checkTopology.C 94 additions, 2 deletions

...ons/utilities/mesh/manipulation/checkMesh/checkTopology.C
applications/utilities/mesh/manipulation/checkMesh/checkTopology.H 9 additions, 2 deletions

...ons/utilities/mesh/manipulation/checkMesh/checkTopology.H
applications/utilities/mesh/manipulation/checkMesh/printMeshStats.H 0 additions, 6 deletions

...ns/utilities/mesh/manipulation/checkMesh/printMeshStats.H
applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options 3 additions, 2 deletions

.../postProcessing/dataConversion/foamToEnsight/Make/options
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C 5 additions, 2 deletions

...ocessing/dataConversion/foamToEnsight/ensightCloudField.C
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C 87 additions, 3 deletions

...ostProcessing/dataConversion/foamToEnsight/ensightField.C
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H 15 additions, 0 deletions

...ostProcessing/dataConversion/foamToEnsight/ensightField.H
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C 3 additions, 1 deletion

...postProcessing/dataConversion/foamToEnsight/ensightMesh.C
applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C 124 additions, 2 deletions

...stProcessing/dataConversion/foamToEnsight/foamToEnsight.C
applications/utilities/postProcessing/dataConversion/foamToEnsightParts/Make/options 2 additions, 0 deletions

...Processing/dataConversion/foamToEnsightParts/Make/options

with 916 additions and 39 deletions

Please register or to comment

Admin message

Admin message

GIT: Resolve conflict on merge from upstream