| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into osd_changes | wm4 | 2012-10-16 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | 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 | ||||
| * | VO: rename file: vo_gl3_shaders.glsl -> vo_opengl_shaders.glsl | wm4 | 2012-10-03 | 1 | -0/+334 |
 |
index : mpv | |
| a free, open source, and cross-platform media player |
| summaryrefslogtreecommitdiffstats |