wm4 31f685040b Merge branch 'master' into remove_old_demuxers ... Conflicts: DOCS/man/en/changes.rst DOCS/man/en/options.rst		2013-07-08 21:55:44 +02:00
..
af.rst	manpage: proofread and fix formatting	2013-07-08 18:02:46 +02:00
ao.rst	manpage: proofread and fix formatting	2013-07-08 18:02:46 +02:00
changes.rst	Merge branch 'master' into remove_old_demuxers	2013-07-08 21:55:44 +02:00
encode.rst	manpage: proofread and fix formatting	2013-07-08 18:02:46 +02:00
input.rst	command: add screenshot_to_file command	2013-07-08 20:37:11 +02:00
mpv.rst	manpage: proofread and fix formatting	2013-07-08 18:02:46 +02:00
options.rst	Merge branch 'master' into remove_old_demuxers	2013-07-08 21:55:44 +02:00
vf.rst	manpage: proofread and fix formatting	2013-07-08 18:02:46 +02:00
vo.rst	manpage: proofread and fix formatting	2013-07-08 18:02:46 +02:00