[nvidia-settings/f28: 2/2] Merge branch 'master' into f28
commit e46d053940d846ce3f269a9731c748590685dd3e
Merge: 1efdb91 d467a2e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 20 10:59:47 2018 +0100
Merge branch 'master' into f28
nvidia-settings.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---