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