[xorg-x11-drv-nvidia/el7: 3/3] Merge branch 'master' into el7
commit 7016f54be31431795a39d1ad6c14b27a53769f12
Merge: fbb3968 d0fb7e0
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Nov 11 12:53:28 2018 +0000
Merge branch 'master' into el7
rhel_nvidia.conf | 8 ++++++++
xorg-x11-drv-nvidia.spec | 10 +++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
---