[xorg-x11-drv-nvidia/f25: 38/38] fix merge
commit a712b8b7c50da494f88cc03ccff47b984bff352f
Merge: be5f85f 2a6cb11
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat May 6 00:10:51 2017 +0100
fix merge
.gitignore | 9 +
60-nvidia-uvm.rules | 2 +
nvidia-uvm.conf | 11 +
nvidia-xorg.conf | 6 -
nvidia.conf | 8 +-
sources | 6 +-
xorg-x11-drv-nvidia.spec | 1769 +++++++++-------------------------------------
xorg.conf.nvidia | 9 +
8 files changed, 371 insertions(+), 1449 deletions(-)
---