[nvidia-settings/f30: 4/4] Merge branch 'master' into f30
commit 8b165596b94edbbbc079274b51ebb5af28ffddcb
Merge: 2593ee6 385e78c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Feb 3 17:37:24 2020 +0000
Merge branch 'master' into f30
.gitignore | 1 +
gcc-10.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-settings.spec | 12 ++++++++++--
sources | 2 +-
4 files changed, 66 insertions(+), 3 deletions(-)
---