[xorg-x11-drv-nvidia/f24: 4/4] Merge branch 'master' into f24
commit c8a618ca3f364e875d36a1ee27581d63d0cef7d6
Merge: 6af1ad6 9e00d61
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jul 1 18:14:47 2016 +0200
Merge branch 'master' into f24
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 25 ++++++++++++++++++-------
2 files changed, 21 insertions(+), 10 deletions(-)
---