Merge commit '33a7b453a8e1f090c694ea4f36769dc837be88f0'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 21:45:58 +0000 (23:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 21:47:19 +0000 (23:47 +0200)
commite8a966e361a7512ecfb03073074c8b9084229e69
treeeecf4e8960441b94232d1a0ac15ecd0277d11661
parent19b9e07ef5fdd8558735538a04fac7f428df190c
parent33a7b453a8e1f090c694ea4f36769dc837be88f0
Merge commit '33a7b453a8e1f090c694ea4f36769dc837be88f0'

* commit '33a7b453a8e1f090c694ea4f36769dc837be88f0':
  doc: mention option to mix shared/static libraries

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