Commit 2a4850f2 authored by Lukáš Lalinský's avatar Lukáš Lalinský
Browse files

Merge branch 'stable' 

Conflicts:
	CMakeLists.txt
parents 3c7b05a9 288c6e4a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment