Merge commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Mar 2015 20:34:03 +0000 (21:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Mar 2015 20:34:14 +0000 (21:34 +0100)
* commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea':
  configure: handle Apple's armv7s in probe_arm_arch()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
Simple merge