[xorg-x11-drv-nvidia/f24: 2/2] Merge branch 'master' into f24
commit a0166dc34059963e1c120f16b8923a59d7cf6b62
Merge: f928a22 6719b37
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Jul 17 14:27:52 2016 +0100
Merge branch 'master' into f24
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 7 +++++--
3 files changed, 11 insertions(+), 5 deletions(-)
---