Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Nov 2012 13:03:31 +0000 (14:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Nov 2012 13:03:31 +0000 (14:03 +0100)
commit7ca97b6b3c9250c77fc5b6f5f9938589e2e18499
treef33e004fc54c5df16824e39eed4f7c8c7c29e7a7
parentd28467b62efe3f7824e23a3b54928c05765d33c8
parent33db40f8d38de03efa0d2a80aa298cf6e1f95093
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: sort cpuflags section by architecture

Conflicts:
configure

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