Merge commit '4936ef6492f640e1606c6507f2c4e495164d3974'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 11:38:55 +0000 (13:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 11:39:32 +0000 (13:39 +0200)
* commit '4936ef6492f640e1606c6507f2c4e495164d3974':
  configure: Handle armcc 5.0

Conflicts:
configure

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

diff --cc configure
Simple merge