Merge branch 'master' into 'tracking_dev'
# Conflicts: # src/modules/AlignmentTrackChi2/README.md
Showing
- .ci/init_x86_64.sh 14 additions, 14 deletions.ci/init_x86_64.sh
- .gitlab-ci.yml 173 additions, 133 deletions.gitlab-ci.yml
- .gitlab/ci/codespell_ignored_words.txt 4 additions, 0 deletions.gitlab/ci/codespell_ignored_words.txt
- .gitlab/ci/download_artifacts.py 6 additions, 3 deletions.gitlab/ci/download_artifacts.py
- .gitlab/ci/gitlab_deploy.sh 3 additions, 0 deletions.gitlab/ci/gitlab_deploy.sh
- .gitlab/ci/load_deps.sh 3 additions, 0 deletions.gitlab/ci/load_deps.sh
- .gitlab/ci/transform_ctest_junit.py 4 additions, 1 deletion.gitlab/ci/transform_ctest_junit.py
- CMakeLists.txt 2 additions, 0 deletionsCMakeLists.txt
- README.md 21 additions, 0 deletionsREADME.md
- cmake/FindMUPIX8DAQ.cmake 7 additions, 6 deletionscmake/FindMUPIX8DAQ.cmake
- cmake/clang-cpp-checks.cmake 105 additions, 73 deletionscmake/clang-cpp-checks.cmake
- cmake/cmake-checks.cmake 22 additions, 0 deletionscmake/cmake-checks.cmake
- cmake/compiler-version-checks.cmake 10 additions, 19 deletionscmake/compiler-version-checks.cmake
- doc/CMakeLists.txt 11 additions, 9 deletionsdoc/CMakeLists.txt
- doc/reference/Doxyfile 305 additions, 100 deletionsdoc/reference/Doxyfile
- doc/usermanual/chapters/configuration.tex 1 addition, 1 deletiondoc/usermanual/chapters/configuration.tex
- etc/docker/Dockerfile.deps 7 additions, 7 deletionsetc/docker/Dockerfile.deps
- etc/setup_lxplus.sh 1 addition, 1 deletionetc/setup_lxplus.sh
- jobsub/README.md 20 additions, 9 deletionsjobsub/README.md
- jobsub/_corry.conf 35 additions, 0 deletionsjobsub/_corry.conf
Loading
Please register or sign in to comment