Skip to content
Snippets Groups Projects
Commit 66176be9 authored by alexander.lysikov's avatar alexander.lysikov
Browse files

Merge branch 'master' into HEAD 

# Conflicts:
#	CMakeLists.txt
parents 2a4bd4a0 bf6737bf
No related branches found
No related tags found
This commit is part of merge request !15. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
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