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

Merge branch 'master' into 'bugs-2706' 

# Conflicts:
#   CMakeLists.txt
parents f5fe9e18 a14a846d
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 2 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