[nvidia-settings/f28: 4/4] Merge branch 'master' into f28
commit 777abf2c40344e146b0d95a8283ad6156f862efd
Merge: e46d053 4e5991e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Aug 28 07:57:16 2018 +0100
Merge branch 'master' into f28
nvidia-settings.spec | 11 ++++++++++-
sources | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
---