Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 Mar 2013 09:31:19 +0000 (11:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 Mar 2013 09:31:19 +0000 (11:31 +0200)
commitf8201cc18b30ae0126376d4e8ea583ef6af0c0d4
treec83e498225265d89091042b2b13689f6b3cd1f24
parent29667a2c2014a54cf05f8106c45ad78be5228fd0
parentf2f57d16795efa8083acef17c640bea6c08aa638
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/platform: Remove part about dllimport
  vp8: Fix pthread_cond and pthread_mutex leaks

Conflicts:
doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/platform.texi