Merge branch 'upstream' into master
Conflicts:
applications/utilities/mesh/generation/blockMesh/blockPoints.C
applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
etc/bashrc
etc/cshrc
etc/settings.csh
etc/settings.sh
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
src/meshTools/searchableSurface/triSurfaceMesh.C
src/meshTools/searchableSurface/triSurfaceMesh.H
src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H
Merged by removing scripts from etc/bashrc and fixing #include
statements.
Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
29 files changed: