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

Merge branch 'master' into closure-size 

TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
parents bbcf127c 468f698f
Expand all 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