Skip to content

Commit

Permalink
Merge branch 'develop' into 'master'
Browse files Browse the repository at this point in the history
merge develop into master

See merge request Scientific-IT-Systems/gr!1229
  • Loading branch information
jheinen committed Mar 8, 2024
2 parents eb44439 + 3644626 commit 9a2d15d
Show file tree
Hide file tree
Showing 51 changed files with 5,108 additions and 2,993 deletions.
158 changes: 158 additions & 0 deletions .clang-tidy

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
.*
!.clang-format
!.clang-tidy
!.cmake-format.py
!.git-blame-ignore-revs
!.githooks/
!.gitignore
!.gitlab-ci
!.gitlab-ci.yml
!.setup_cmakeformat.sh
*.a
Expand Down
Loading

0 comments on commit 9a2d15d

Please sign in to comment.