[nvidia-settings/f27: 7/7] Merge branch 'master' into f27
commit f6e19735806488e7b26b68d5af39640752f81ee4
Merge: e998104 8ee1d47
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Oct 28 12:35:52 2018 +0000
Merge branch 'master' into f27
nvidia-settings.spec | 17 +++++++++++++++--
sources | 2 +-
2 files changed, 16 insertions(+), 3 deletions(-)
---