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)
* 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>
1  2 
doc/platform.texi

Simple merge