Commit 54df78af authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b7c3bfd5'

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

Conflicts:
	compat/w32pthreads.h

See: 8c6992bfMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 09c538b6 b7c3bfd5
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment