mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Conflicts: applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C src/Allwmake src/edgeMesh/Make/files src/edgeMesh/edgeMesh.C src/edgeMesh/edgeMesh.H src/edgeMesh/edgeMeshI.H src/edgeMesh/edgeMeshIO.C src/edgeMesh/featureEdgeMesh.C src/edgeMesh/featureEdgeMesh.H src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H src/meshTools/searchableSurface/closedTriSurfaceMesh.C src/meshTools/searchableSurface/closedTriSurfaceMesh.H Merged Mark's work on edgeMesh with my featureEdgeMesh.