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
..
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 'master' into osd_changes	2012-10-16 07:30:30 +02:00
encoding.rst	Rename to "mpv"	2012-10-12 10:14:32 +02:00
tech-overview.txt	Rename to "mpv"	2012-10-12 10:14:32 +02:00