Skip to content
Snippets Groups Projects
Commit cf40caae authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'master' into 'bugs-2706' 

# Conflicts:
#   CMakeLists.txt
parents 9f7ed19b 1f700167
This commit is part of merge request !3. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 3 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