Merge branch 'master' into feature/extract-ptinterface
Conflicts: docs/user-guide/utilities/meshconvert.tex
No related branches found
No related tags found
Showing
- CMakeLists.txt 12 additions, 8 deletionsCMakeLists.txt
- VERSION 1 addition, 1 deletionVERSION
- cmake/Nektar++Config.cmake.in 2 additions, 6 deletionscmake/Nektar++Config.cmake.in
- cmake/NektarCommon.cmake 0 additions, 5 deletionscmake/NektarCommon.cmake
- cmake/ThirdPartyOCC.cmake 61 additions, 0 deletionscmake/ThirdPartyOCC.cmake
- cmake/ThirdPartyZlib.cmake 6 additions, 0 deletionscmake/ThirdPartyZlib.cmake
- docs/developer-guide/CMakeLists.txt 24 additions, 4 deletionsdocs/developer-guide/CMakeLists.txt
- docs/developer-guide/developer-guide.tex 34 additions, 8 deletionsdocs/developer-guide/developer-guide.tex
- docs/developer-guide/memoir.4ht 68 additions, 0 deletionsdocs/developer-guide/memoir.4ht
- docs/developer-guide/styling.cfg 66 additions, 3 deletionsdocs/developer-guide/styling.cfg
- docs/refs.bib 2 additions, 0 deletionsdocs/refs.bib
- docs/user-guide/CMakeLists.txt 26 additions, 4 deletionsdocs/user-guide/CMakeLists.txt
- docs/user-guide/faq/faq.tex 13 additions, 1 deletiondocs/user-guide/faq/faq.tex
- docs/user-guide/installation/installation.tex 3 additions, 3 deletionsdocs/user-guide/installation/installation.tex
- docs/user-guide/installation/precompiled.tex 5 additions, 3 deletionsdocs/user-guide/installation/precompiled.tex
- docs/user-guide/installation/source.tex 20 additions, 1 deletiondocs/user-guide/installation/source.tex
- docs/user-guide/introduction/introduction.tex 4 additions, 1 deletiondocs/user-guide/introduction/introduction.tex
- docs/user-guide/memoir.4ht 68 additions, 0 deletionsdocs/user-guide/memoir.4ht
- docs/user-guide/solvers/adr.tex 11 additions, 11 deletionsdocs/user-guide/solvers/adr.tex
- docs/user-guide/solvers/ape.tex 5 additions, 5 deletionsdocs/user-guide/solvers/ape.tex
Loading
Please register or sign in to comment