Commit 27515508 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd4a8a86c'

* commit 'd4a8a86c':
  doc: Libavfilter English cleanup

Conflicts:
	doc/filters.texi
	doc/libavfilter.texi
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 571d2ffa d4a8a86c
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment