Skip to content
Snippets Groups Projects
Commit 33a4b458 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge branch 'master-stable' 

Conflicts:
	CMakeLists.txt
parents 21fa182a d5b05bc8
No related branches found
No related tags found
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