Merge remote-tracking branch 'upstream/master' into feature/dump-mesh-on-failure
Conflicts: utilities/NekMesh/InputModules/InputMCF.cpp
No related branches found
No related tags found
Showing
- .gitmodules 5 additions, 0 deletions.gitmodules
- CHANGELOG.md 12 additions, 2 deletionsCHANGELOG.md
- VERSION 1 addition, 1 deletionVERSION
- docs/CMakeLists.txt 4 additions, 1 deletiondocs/CMakeLists.txt
- docs/developer-guide 1 addition, 0 deletionsdocs/developer-guide
- docs/developer-guide/CMakeLists.txt 0 additions, 43 deletionsdocs/developer-guide/CMakeLists.txt
- docs/developer-guide/coding-standard/coding-standard.tex 0 additions, 145 deletionsdocs/developer-guide/coding-standard/coding-standard.tex
- docs/developer-guide/core-concepts/core-concepts.tex 0 additions, 354 deletionsdocs/developer-guide/core-concepts/core-concepts.tex
- docs/developer-guide/data-structures-algorithms/connectivity.tex 0 additions, 289 deletions...veloper-guide/data-structures-algorithms/connectivity.tex
- docs/developer-guide/data-structures-algorithms/data-structures-algorithms.tex 0 additions, 8 deletions...data-structures-algorithms/data-structures-algorithms.tex
- docs/developer-guide/data-structures-algorithms/preconditioners.tex 0 additions, 385 deletions...oper-guide/data-structures-algorithms/preconditioners.tex
- docs/developer-guide/data-structures-algorithms/time-integration.tex 0 additions, 908 deletions...per-guide/data-structures-algorithms/time-integration.tex
- docs/developer-guide/developer-guide.tex 0 additions, 467 deletionsdocs/developer-guide/developer-guide.tex
- docs/developer-guide/img/icon-blue.png 0 additions, 0 deletionsdocs/developer-guide/img/icon-blue.png
- docs/developer-guide/library-design/img/LocalRegions.png 0 additions, 0 deletionsdocs/developer-guide/library-design/img/LocalRegions.png
- docs/developer-guide/library-design/img/MultiRegions.png 0 additions, 0 deletionsdocs/developer-guide/library-design/img/MultiRegions.png
- docs/developer-guide/library-design/img/Quasi3d.png 0 additions, 0 deletionsdocs/developer-guide/library-design/img/Quasi3d.png
- docs/developer-guide/library-design/img/SpatialDomains.png 0 additions, 0 deletionsdocs/developer-guide/library-design/img/SpatialDomains.png
- docs/developer-guide/library-design/img/StdRegions.png 0 additions, 0 deletionsdocs/developer-guide/library-design/img/StdRegions.png
- docs/developer-guide/library-design/img/architecture.eps 0 additions, 2895 deletionsdocs/developer-guide/library-design/img/architecture.eps
docs/developer-guide/CMakeLists.txt
deleted
100644 → 0
This diff is collapsed.
8.87 KiB
21.4 KiB
27.9 KiB
38 KiB
23.9 KiB
27.7 KiB
This diff is collapsed.