[xorg-x11-drv-nvidia/f25: 2/2] Merge branch 'master' into f25
commit 4c2f268457832fe0e836f0da06df88eb2feb47b7
Merge: 2320fc5 c0605a9
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Dec 14 19:00:42 2016 +0000
Merge branch 'master' into f25
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 5 ++++-
3 files changed, 10 insertions(+), 4 deletions(-)
---