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

fix the last master merge, sorry for the problems 

Now I carefully re-merged all the conflicts and tested some builds.
Hopefully it's all OK now.
parent d9a2b1f5
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