Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev
Conflicts: etc/settings.csh etc/settings.sh src/parallel/decompose/Allwmake
Showing
- README 14 additions, 13 deletionsREADME
- applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H 9 additions, 2 deletions...graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
- applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C 33 additions, 11 deletions...V3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
- bin/foamCleanPath 4 additions, 17 deletionsbin/foamCleanPath
- bin/foamEndJob 67 additions, 39 deletionsbin/foamEndJob
- bin/foamEtcFile 65 additions, 20 deletionsbin/foamEtcFile
- bin/foamJob 137 additions, 128 deletionsbin/foamJob
- bin/mpirunDebug 86 additions, 67 deletionsbin/mpirunDebug
- etc/apps/ensight/cshrc 2 additions, 2 deletionsetc/apps/ensight/cshrc
- etc/apps/paraview3/cshrc 4 additions, 4 deletionsetc/apps/paraview3/cshrc
- etc/bashrc 1 addition, 1 deletionetc/bashrc
- etc/cshrc 8 additions, 8 deletionsetc/cshrc
- etc/prefs.csh-EXAMPLE 2 additions, 2 deletionsetc/prefs.csh-EXAMPLE
- etc/prefs.sh-EXAMPLE 3 additions, 2 deletionsetc/prefs.sh-EXAMPLE
- etc/settings.csh 25 additions, 27 deletionsetc/settings.csh
- etc/settings.sh 20 additions, 19 deletionsetc/settings.sh
- src/OpenFOAM/primitives/one/oneI.H 8 additions, 1 deletionsrc/OpenFOAM/primitives/one/oneI.H
Please register or sign in to comment