[xorg-x11-drv-nvidia/f25: 5/5] Merge branch 'master' into f25
commit f4ea70c8fabef9615c991b28e950e8f2edc47545
Merge: dc51e40 286375c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Feb 15 16:34:28 2017 +0000
Merge branch 'master' into f25
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 24 +++++++++++++++---------
3 files changed, 21 insertions(+), 12 deletions(-)
---