commit 31cf191572d7c02275535d2f59eef2ca14a58a31 Merge: 24e34e2 35be212 Author: Orion Poplawski <orion(a)cora.nwra.com&gt; Date: Tue Aug 23 14:00:02 2016 -0600 Merge branch 'master' into el7 Conflicts: sources x265-pic.patch x265-test-shared.patch x265.spec .gitignore | 2 ++ sources | 2 +- x265-detect_cpu_armhfp.patch | 17 ++++++++++ x265-fix-soname.patch | 30 ------------------ x265-pic.patch | 40 ++++++++++++++---------- x265-test-shared.patch | 15 +++++---- x265.spec | 74 ++++++++++++++++++++++++++------------------ 7 files changed, 95 insertions(+), 85 deletions(-) ---