-
- Downloads
resolving merge conflict
Showing
- Allwmake 4 additions, 1 deletionAllwmake
- README 29 additions, 34 deletionsREADME
- applications/test/dictionary/calcEntry/calcEntry.C 2 additions, 19 deletionsapplications/test/dictionary/calcEntry/calcEntry.C
- applications/test/dictionary/calcEntry/calcEntry.H 1 addition, 6 deletionsapplications/test/dictionary/calcEntry/calcEntry.H
- applications/test/dictionary/testDict 51 additions, 8 deletionsapplications/test/dictionary/testDict
- applications/test/dictionary/testDict2 30 additions, 0 deletionsapplications/test/dictionary/testDict2
- applications/test/dictionary/value 2 additions, 1 deletionapplications/test/dictionary/value
- applications/utilities/mesh/conversion/Optional/Allwmake 3 additions, 0 deletionsapplications/utilities/mesh/conversion/Optional/Allwmake
- bin/mpirunDebug 13 additions, 10 deletionsbin/mpirunDebug
- bin/tools/CleanFunctions 1 addition, 2 deletionsbin/tools/CleanFunctions
- bin/tools/RunFunctions 1 addition, 2 deletionsbin/tools/RunFunctions
- bin/tools/buildParaViewFunctions 2 additions, 2 deletionsbin/tools/buildParaViewFunctions
- bin/tools/thirdPartyGetFunctions 1 addition, 2 deletionsbin/tools/thirdPartyGetFunctions
- etc/aliases.csh 6 additions, 0 deletionsetc/aliases.csh
- etc/aliases.sh 6 additions, 0 deletionsetc/aliases.sh
- src/OSspecific/Unix/Unix.C 4 additions, 16 deletionssrc/OSspecific/Unix/Unix.C
- src/OpenFOAM/Make/files 1 addition, 0 deletionssrc/OpenFOAM/Make/files
- src/OpenFOAM/Make/options 1 addition, 1 deletionsrc/OpenFOAM/Make/options
- src/OpenFOAM/db/IOobject/IOobject.H 2 additions, 5 deletionssrc/OpenFOAM/db/IOobject/IOobject.H
- src/OpenFOAM/db/IOobject/IOobjectI.H 12 additions, 26 deletionssrc/OpenFOAM/db/IOobject/IOobjectI.H
Loading
Please register or sign in to comment