diff options
author | wm4 <wm4@nowhere> | 2012-10-16 07:30:30 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-16 07:30:30 +0200 |
commit | 4e89851aa128a614f59ff4885af384a266cb24e6 (patch) | |
tree | c6ab9f34ef3e9c1d58f8ec837b93e249e79bdcf6 /osdep/mplayer.exe.manifest | |
parent | f45eab6faea05834c1337175dbe51437707b8d7e (diff) | |
parent | 6557f206efeb4569a42f1e4810172bc97fd64619 (diff) | |
download | mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.bz2 mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.xz |
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 'osdep/mplayer.exe.manifest')
-rw-r--r-- | osdep/mplayer.exe.manifest | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/osdep/mplayer.exe.manifest b/osdep/mplayer.exe.manifest index 7a0102dc3f..c924377c4b 100644 --- a/osdep/mplayer.exe.manifest +++ b/osdep/mplayer.exe.manifest @@ -3,10 +3,10 @@ <assemblyIdentity version="0.0.9.0" processorArchitecture="*" - name="MPlayer - The Movie Player" + name="mpv - The Movie Player" type="win32" /> - <description>MPlayer - The Movie Player</description> + <description>mpv - The Movie Player</description> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> <security> <requestedPrivileges> |