1
mirror of https://github.com/mpv-player/mpv synced 2024-09-12 23:45:53 +02:00
mpv/DOCS/man/en
wm4 4e89851aa1 Merge branch 'master' into osd_changes
Conflicts:
	Makefile
	command.c
	libvo/gl_common.c
	libvo/vo_corevideo.m
	libvo/vo_opengl.c
	libvo/vo_opengl_old.c
	libvo/vo_opengl_shaders.glsl
	sub/ass_mp.c
	sub/osd_libass.c
	sub/sd_ass.c
2012-10-16 07:30:30 +02:00
..
af.rst Rename to "mpv" 2012-10-12 10:14:32 +02:00
ao.rst Rename to "mpv" 2012-10-12 10:14:32 +02:00
changes.rst Merge branch 'input_changes' into master 2012-10-12 11:53:53 +02:00
encode.rst encode: remove dependency on current ffmpeg 2012-10-01 11:04:48 +02:00
input.rst core: show quvi page title in window title, clean up libquvi handling 2012-10-14 22:26:41 +02:00
mpv.rst Merge branch 'input_changes' into master 2012-10-12 11:53:53 +02:00
options.rst Merge branch 'master' into osd_changes 2012-10-16 07:30:30 +02:00
vf.rst Remove useless video filters 2012-10-03 01:28:40 +02:00
vo.rst manpage: improvements to vo_opengl documentation 2012-10-15 00:28:59 +02:00