Merge commit 'a9a2f3613040c4f90bf15cbd76f8671252ecc043'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 19:23:16 +0000 (21:23 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 19:23:16 +0000 (21:23 +0200)
commit6727380d0527a62fc4067048aaefd1e226313c81
treee4210bb2e1a614d11f2ac093fd002feee0d64d10
parent98c7f9741eddeeaf037d820d86ff10787e4d5bba
parenta9a2f3613040c4f90bf15cbd76f8671252ecc043
Merge commit 'a9a2f3613040c4f90bf15cbd76f8671252ecc043'

* commit 'a9a2f3613040c4f90bf15cbd76f8671252ecc043':
  doc: add a section about building with libmfx

Conflicts:
doc/general.texi

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
doc/general.texi