[xorg-x11-drv-nvidia/el7: 25/25] Merge branch 'master' into el7
commit 7acaffddc4b835b2648129121379d23fbb29f561
Merge: 04c8c24 414c585
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Aug 29 16:54:35 2018 +0100
Merge branch 'master' into el7
00-avoid-glamor.conf | 6 -
99-nvidia.conf | 7 -
blacklist-nouveau.conf | 4 -
noautobuild | 1 +
nvidia-settings.desktop | 12 --
sources | 4 +-
xorg-x11-drv-nvidia.metainfo.xml | 1 +
xorg-x11-drv-nvidia.spec | 307 +++++++++++++++------------------------
8 files changed, 120 insertions(+), 222 deletions(-)
---