commit dc51e404a2110de22d59d40e2498731152216455 Merge: 14f0dcc 8295212 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Mon Jan 23 14:55:59 2017 +0000 Merge branch 'master' into f25 nvidia.conf | 2 - parse-readme.py | 61 ++++++++++++++++++++++ xorg-x11-drv-nvidia.metainfo.xml | 36 +++++++++++++ xorg-x11-drv-nvidia.spec | 109 ++++++++++++++++++++++++++++++++------- 4 files changed, 187 insertions(+), 21 deletions(-) ---