
* commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac': fate: explicitly set the default THREADS value Conflicts: tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac': fate: explicitly set the default THREADS value Conflicts: tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>