Merge commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Oct 2014 10:25:50 +0000 (12:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Oct 2014 10:25:50 +0000 (12:25 +0200)
commit54df78af657bbbd8b5e89b7bd8756be38e98e7d7
treeaa7d07974d67ba288807dbf5228e40303dd9d849
parent09c538b6e6f3a2abb3143e88cce33c58ca64fd9d
parentb7c3bfd5eb3153f7de8039f96e7911b2a1d46cae
Merge commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae'

* commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae':
  w32pthreads: use the condition variable API directly when targeting newer versions of Windows

Conflicts:
compat/w32pthreads.h

See: 8c6992bf0cc24542a5ae245cd037a23638b76d75
Merged-by: Michael Niedermayer <michaelni@gmx.at>