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

1 files changed, 1 insertions, 1 deletions

diff --git a/version.c b/version.c
index e3e6c4ac81..f06f0afc30 100644
--- a/version.c
+++ b/version.c
@@ -18,4 +18,4 @@
 
 #include "version.h"
 
-const char *mplayer_version  = "mplayer " VERSION;
+const char *mplayer_version  = "mpv " VERSION;