commit 52853305694bc4995a3e23e6cd75ed6fe6c73639 Merge: e4897dd c9c60e0 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Mon Dec 19 10:50:35 2016 +0000 fix merge .gitignore | 21 ++++++++--- 00-ignoreabi.conf | 4 ++ nvidia-old.conf | 8 ++++ nvidia.conf | 3 ++ sources | 6 +-- xorg-x11-drv-nvidia.spec | 95 ++++++++++++++++++++++++++++++++++-------------- 6 files changed, 101 insertions(+), 36 deletions(-) ---