Merge commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71'

Browse Source

* commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71':
  doc: Libavfilter English cleanup

Conflicts:
	doc/filters.texi
	doc/libavfilter.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2014-04-13 00:37:32 +02:00

parent 571d2ffa47 d4a8a86c68

commit 275155081f

1 changed files with 452 additions and 454 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

906

doc/filters.texi

File diff suppressed because it is too large Load Diff