wm4 84829a4ea1 Merge branch 'osd_changes' into master ... Conflicts: DOCS/man/en/options.rst		2012-11-01 02:12:47 +01:00
..
af.rst	Rename to "mpv"	2012-10-12 10:14:32 +02:00
ao.rst	manpage: cleanup	2012-10-24 21:56:35 +02:00
changes.rst	Merge branch 'osd_changes' into master	2012-11-01 02:12:47 +01:00
encode.rst	encode: remove dependency on current ffmpeg	2012-10-01 11:04:48 +02:00
input.rst	manpage: cleanup	2012-10-24 21:56:35 +02:00
mpv.rst	manpage: cleanup	2012-10-24 21:56:35 +02:00
options.rst	Merge branch 'osd_changes' into master	2012-11-01 02:12:47 +01:00
vf.rst	VF: rename vf_ass to vf_sub	2012-10-24 21:56:34 +02:00
vo.rst	manpage: cleanup	2012-10-24 21:56:35 +02:00