Merge commit '82b6e451161f19ab90bfb9565b710021caf5dcbd'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Feb 2015 18:36:28 +0000 (19:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Feb 2015 18:36:28 +0000 (19:36 +0100)
commit51b7ab2ee70fa6f8f5ee2f7339e92d60ded57834
tree4b51fe4db4f5dbb398f06b89285f61f2207ba3c1
parent43e5e3c077bcc41b54a3d306ea149f2895cabb32
parent82b6e451161f19ab90bfb9565b710021caf5dcbd
Merge commit '82b6e451161f19ab90bfb9565b710021caf5dcbd'

* commit '82b6e451161f19ab90bfb9565b710021caf5dcbd':
  configure: Move the cross_prefix setting after the toolchain one

Conflicts:
configure

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