Merge commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 12:07:36 +0000 (13:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 12:07:36 +0000 (13:07 +0100)
commitcd88d89493d3988c990d815e9b2a9b8c3a5f6743
tree3e5a19c2f8e3176eddfe278e9a50d7733b83d788
parent80793afb177ebfbc2d68327d2ca0380acc734cba
parentfb3b2f5d923a6e19d80f21eb4e081674bceec810
Merge commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810'

* commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810':
  configure: Set the thread type after resolving dependencies

Conflicts:
configure

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