Merge branch 'master' into sebas/touchscreen

Authored by sebas on Sep 20 2017, 1:22 PM.

Description

Merge branch 'master' into sebas/touchscreen

Details

Committed
sebasSep 20 2017, 1:22 PM
Parents
R110:3ff018569621: Also copy scale in Output::apply()
R110:ac335a98e082: Make it almost work
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
3ff018569621sebas
Also copy scale in Output::apply() 
Sep 20 2017
dc8c17e70980sebas
Merge scale changes 
Sep 20 2017
8a89d204777aD6011clutz/sebas
let's continue in debug code instead of returning from XRandRConfig… 
Sep 20 2017
114d654b7fe6D6026davidedmundson/sebas
Add setScale option to kscreendoctor 
Sep 20 2017
159e4baf6227sebas
Use QString for number parsing 
Sep 19 2017
ea01f5e2ca8dsebas
fix comment 
Sep 19 2017
bf4521e4f4c6sebas
kscreen-doctor: support setting scale of outputs 
Sep 19 2017
7d30357b3ed4sebas
Test only changing the scale 
Sep 19 2017
49503702abdd jriddell
Update version number for 5.11.90 GIT_SILENT 
Sep 14 2017
fbc62bb4454a jriddell
Update version number for 5.10.95 GIT_SILENT 
Sep 13 2017
05498b805259D7807davidedmundson
When cloning a config also clone supportedFeatures 
Sep 13 2017