[NRRPLT-6948] git merge v2.18.0 --squash + resolved conflicts
Showing
- .clang-format 1 addition, 1 deletion.clang-format
- .gitignore 6 additions, 1 deletion.gitignore
- .mention-bot 0 additions, 3 deletions.mention-bot
- .travis.yml 137 additions, 96 deletions.travis.yml
- ACKNOWLEDGMENTS.md 34 additions, 0 deletionsACKNOWLEDGMENTS.md
- CMakeLists.txt 67 additions, 55 deletionsCMakeLists.txt
- CONTRIBUTING.md 2 additions, 2 deletionsCONTRIBUTING.md
- INSTALL 54 additions, 37 deletionsINSTALL
- NEWS 0 additions, 1 deletionNEWS
- cmake/CPackVariables.cmake 0 additions, 69 deletionscmake/CPackVariables.cmake
- cmake/CheckIncludesSymbols.cmake 41 additions, 1 deletioncmake/CheckIncludesSymbols.cmake
- cmake/ConfigureSummary.cmake 23 additions, 2 deletionscmake/ConfigureSummary.cmake
- cmake/DefaultCompilerFlags.cmake 7 additions, 8 deletionscmake/DefaultCompilerFlags.cmake
- cmake/FindLTDL.cmake 10 additions, 5 deletionscmake/FindLTDL.cmake
- cmake/FindLibNeurosim.cmake 10 additions, 8 deletionscmake/FindLibNeurosim.cmake
- cmake/FindMusic.cmake 10 additions, 6 deletionscmake/FindMusic.cmake
- cmake/FindReadline.cmake 12 additions, 8 deletionscmake/FindReadline.cmake
- cmake/NestVersionInfo.cmake 73 additions, 0 deletionscmake/NestVersionInfo.cmake
- cmake/Platform/Fujitsu-Sparc64.cmake 3 additions, 10 deletionscmake/Platform/Fujitsu-Sparc64.cmake
- cmake/Platform/JURON_Base.cmake 189 additions, 0 deletionscmake/Platform/JURON_Base.cmake
Please register or sign in to comment