[xorg-x11-drv-nvidia/el7: 105/105] fix merge
commit d6faf2f7ff3dc737de61d695f53ea40e83c56c75
Merge: 7e89de0 75e76f9
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 18 12:58:14 2017 +0000
fix merge
.gitignore | 24 +-
00-ignoreabi.conf | 4 +
nvidia-old.conf | 8 +
nvidia-snapshot.sh | 7 -
nvidia.conf | 17 ++
parse-readme.py | 61 ++++
sources | 6 +-
xorg-x11-drv-nvidia.metainfo.xml | 36 +++
xorg-x11-drv-nvidia.spec | 615 +++++++++++++++++++++++++++++----------
9 files changed, 611 insertions(+), 167 deletions(-)
---