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

Merge branch 'stable' 

Conflicts:
	CMakeLists.txt
	NEWS
parents dafb3af7 059f2243
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