Branch merge + conflict resolution
Showing
- applications/test/tokenizeTest/tokenizeTest.C 7 additions, 1 deletionapplications/test/tokenizeTest/tokenizeTest.C
- applications/utilities/mesh/generation/blockMesh/blockMeshApp.C 2 additions, 2 deletions...ations/utilities/mesh/generation/blockMesh/blockMeshApp.C
- applications/utilities/mesh/manipulation/transformPoints/transformPoints.C 35 additions, 8 deletions...ities/mesh/manipulation/transformPoints/transformPoints.C
- applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C 3 additions, 3 deletions...stProcessing/dataConversion/foamToEnsight/foamToEnsight.C
- applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C 1 addition, 1 deletion...ng/dataConversion/foamToEnsightParts/foamToEnsightParts.C
- applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C 34 additions, 8 deletions...ities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
- applications/utilities/surface/README 1 addition, 1 deletionapplications/utilities/surface/README
- applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C 52 additions, 233 deletions...ies/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
- applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C 1 addition, 1 deletion...ies/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
- applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C 39 additions, 8 deletions...s/surface/surfaceTransformPoints/surfaceTransformPoints.C
- src/Allwmake 1 addition, 1 deletionsrc/Allwmake
- src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H 6 additions, 0 deletionssrc/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
- src/OpenFOAM/db/IOstreams/Sstreams/ISstreamI.H 6 additions, 0 deletionssrc/OpenFOAM/db/IOstreams/Sstreams/ISstreamI.H
- src/OpenFOAM/global/argList/argList.C 32 additions, 5 deletionssrc/OpenFOAM/global/argList/argList.C
- src/OpenFOAM/global/argList/argList.H 8 additions, 1 deletionsrc/OpenFOAM/global/argList/argList.H
- src/edgeMesh/Make/files 22 additions, 1 deletionsrc/edgeMesh/Make/files
- src/edgeMesh/edgeFormats/edgeFormatsCore.C 200 additions, 0 deletionssrc/edgeMesh/edgeFormats/edgeFormatsCore.C
- src/edgeMesh/edgeFormats/edgeFormatsCore.H 118 additions, 0 deletionssrc/edgeMesh/edgeFormats/edgeFormatsCore.H
- src/edgeMesh/edgeFormats/emesh/EMESHedgeFormat.C 195 additions, 0 deletionssrc/edgeMesh/edgeFormats/emesh/EMESHedgeFormat.C
- src/edgeMesh/edgeFormats/emesh/EMESHedgeFormat.H 148 additions, 0 deletionssrc/edgeMesh/edgeFormats/emesh/EMESHedgeFormat.H
Please register or sign in to comment