Merge commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Mar 2014 01:40:44 +0000 (02:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Mar 2014 01:40:44 +0000 (02:40 +0100)
commit29df24252aa920dfa7ad538b76b7f03d68f8e426
treefc222826e048e655f6aa15c67b2e6e06289179a8
parentf800cacada795018c2b7be1f0c0e637b2ee7aef7
parent2b9ee7d5b901e0d7ba617511e4ed31d3043894d3
Merge commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3' into release/2.2

* commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3':
  doc: Add section about AviSynth support

Conflicts:
doc/general.texi

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