Skip to content
Commit dfed4ad5 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge master into x-updates (to fix qt5 build)

parents 35554844 849b383f
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