wm4 84829a4ea1 Merge branch 'osd_changes' into master ... Conflicts: DOCS/man/en/options.rst		2012-11-01 02:12:47 +01:00
..
OUTDATED-tech	vf_rectangle: remove as it is very dirty and we have a replacement now	2012-09-18 21:08:20 +02:00
man/en	Merge branch 'osd_changes' into master	2012-11-01 02:12:47 +01:00
encoding.rst	Rename to "mpv"	2012-10-12 10:14:32 +02:00
tech-overview.txt	core: disable vf_sub auto-insertion	2012-10-24 21:56:34 +02:00