Skip to content
Snippets Groups Projects
Commit 0957e455 authored by Graziano Scalamera's avatar Graziano Scalamera
Browse files

Merge branch 'master' into '1-add-macos-compatibility' 

# Conflicts:
#   CMakeLists.txt
#   test/testdevice/CMakeLists.txt
parents 7fc402d3 38b7db6e
No related branches found
No related tags found
1 merge request!3Resolve "Add macOS compatibility"
Pipeline #2040 passed with stages
in 3 minutes and 20 seconds
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment