[nvidia-settings/f28: 3/3] Merge branch 'master' into f28
commit 6388cb2bd21a75f919f0689f3ac9ff61cc85bcdd
Merge: 4e7b413 f25ac91
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Jul 10 01:48:17 2018 +0100
Merge branch 'master' into f28
nvidia-settings.spec | 9 ++++++---
sources | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
---