diff options
author | 2012-10-16 07:30:30 +0200 | |
---|---|---|
committer | 2012-10-16 07:30:30 +0200 | |
commit | 4e89851aa128a614f59ff4885af384a266cb24e6 (patch) | |
tree | c6ab9f34ef3e9c1d58f8ec837b93e249e79bdcf6 /version.c | |
parent | f45eab6faea05834c1337175dbe51437707b8d7e (diff) | |
parent | 6557f206efeb4569a42f1e4810172bc97fd64619 (diff) |
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
Diffstat (limited to 'version.c')
-rw-r--r-- | version.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -18,4 +18,4 @@ #include "version.h" -const char *mplayer_version = "mplayer " VERSION; +const char *mplayer_version = "mpv " VERSION; |