graham
ff671ff1bb
Merge branch 'master' into cvm
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.