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

Merge master into closure-size 

The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
parents f306e67e 0ee75214
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