[nvidia-settings/f27: 2/2] Merge branch 'master' into f27
commit 01a45c863aba57fafa41086b20c7aa458a474728
Merge: 5966841 d467a2e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Jul 20 11:00:01 2018 +0100
Merge branch 'master' into f27
nvidia-settings.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---