Merge remote-tracking branch 'origin/feature/buildInstructions' into nextRelease
Conflicts: doc/buildInstructions/Centos/5.5/Compilation_Centos_5.5_64bit.txt doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_32-bit.txt doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_64-bit.txt
This commit is contained in:
commit
9eef2d503a
1 changed files with 8 additions and 0 deletions
8
.gitignore
vendored
8
.gitignore
vendored
|
@ -117,4 +117,12 @@ src/lduSolvers/amg/amgPolicy/samgPolicy.H
|
||||||
src/lduSolvers/amg/amgPolicy/aamgPolicy.C
|
src/lduSolvers/amg/amgPolicy/aamgPolicy.C
|
||||||
src/lduSolvers/amg/amgPolicy/aamgPolicy.H
|
src/lduSolvers/amg/amgPolicy/aamgPolicy.H
|
||||||
|
|
||||||
|
# The following files are blacklisted because of a DMCA complaint by ANSYS.
|
||||||
|
src/lduSolvers/tools/PriorityArray.C
|
||||||
|
src/lduSolvers/tools/PriorityArray.H
|
||||||
|
src/lduSolvers/amg/amgPolicy/samgPolicy.C
|
||||||
|
src/lduSolvers/amg/amgPolicy/samgPolicy.H
|
||||||
|
src/lduSolvers/amg/amgPolicy/aamgPolicy.C
|
||||||
|
src/lduSolvers/amg/amgPolicy/aamgPolicy.H
|
||||||
|
|
||||||
# end-of-file
|
# end-of-file
|
||||||
|
|
Reference in a new issue