commit 5f0605dc99dc6afb87b66d2fee97d6c8634909c1 Merge: 365c3ec 7016149 Author: Orion Poplawski <orion(a)cora.nwra.com&gt; Date: Tue Aug 23 11:12:49 2016 -0600 Merge branch 'master' into el7 Conflicts: .gitignore mpg123.spec sources .gitignore | 4 +- mpg123-1.19.0-armv7hl.patch | 12 -- mpg123.spec | 259 ++++++++++++++++++++++---------------------- sources | 2 +- 4 files changed, 131 insertions(+), 146 deletions(-) ---