[xorg-x11-drv-nvidia/f24: 2/2] Merge branch 'master' into f24
commit 47afd927f6b5a5146fa6e7bd95258eb3a9ead0d0
Merge: d5f68d0 c3441e3
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Aug 24 06:51:12 2016 +0100
Merge branch 'master' into f24
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 7 +++++--
3 files changed, 11 insertions(+), 5 deletions(-)
---