Merge branch 'develop' into 'main'
Merge develop into main for v1.2 Closes #273 and #285 See merge request !266
Showing
- .clang-tidy 1 addition, 1 deletion.clang-tidy
- .gitattributes 0 additions, 1 deletion.gitattributes
- .gitignore 1 addition, 18 deletions.gitignore
- CMakeLists.txt 1 addition, 0 deletionsCMakeLists.txt
- Doxyfile 2 additions, 23 deletionsDoxyfile
- NOTICE.md 54 additions, 29 deletionsNOTICE.md
- cmake/HelperMacros.cmake 17 additions, 8 deletionscmake/HelperMacros.cmake
- cmake/global.cmake 7 additions, 10 deletionscmake/global.cmake
- cmake/install_deps.cmake 5 additions, 1 deletioncmake/install_deps.cmake
- cmake/install_xmlSchemas.cmake 1 addition, 1 deletioncmake/install_xmlSchemas.cmake
- conanfile.py 0 additions, 127 deletionsconanfile.py
- doc/CMakeLists.txt 3 additions, 2 deletionsdoc/CMakeLists.txt
- doc/source/advanced_topics/simulator/scenario_actions.rst 81 additions, 37 deletionsdoc/source/advanced_topics/simulator/scenario_actions.rst
- doc/source/advanced_topics/simulator/simulation.rst 3 additions, 0 deletionsdoc/source/advanced_topics/simulator/simulation.rst
- doc/source/conf.py 0 additions, 1 deletiondoc/source/conf.py
- doc/source/developer_information/30_coding_conventions.rst 4 additions, 4 deletionsdoc/source/developer_information/30_coding_conventions.rst
- doc/source/developer_information/_static/custom_doc/CMakeLists_doc.cmake 3 additions, 2 deletions...loper_information/_static/custom_doc/CMakeLists_doc.cmake
- doc/source/developer_information/ide_support/_static/vscode/config/linux/settings.json 0 additions, 1 deletion...ion/ide_support/_static/vscode/config/linux/settings.json
- doc/source/index.rst 1 addition, 6 deletionsdoc/source/index.rst
- doc/source/installation_guide/20_install_prerequisites.rst 36 additions, 26 deletionsdoc/source/installation_guide/20_install_prerequisites.rst
Loading
Please register or sign in to comment