commit 2320fc52a29a4f49fccb24f690fd948a14aa44e0 Merge: 039843e c329399 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Fri Nov 18 17:56:13 2016 +0000 fix merge .gitignore | 6 ++++++ sources | 6 +++--- xorg-x11-drv-nvidia.spec | 27 ++++++++++++++++++++------- 3 files changed, 29 insertions(+), 10 deletions(-) ---