[x265/el7: 2/2] Merge branch 'master' into el7
commit 3fffb956c2d1201167f566e0bda02b538c77555f
Merge: d9c20fe 16754e9
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Dec 30 21:55:19 2018 +0000
Merge branch 'master' into el7
x265.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---