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 /etc/example.conf | |
| 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 'etc/example.conf')
| -rw-r--r-- | etc/example.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/example.conf b/etc/example.conf index 588ec00b7e..a68dc39cca 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -1,8 +1,8 @@ # -# MPlayer configuration file +# mpv configuration file # -# Configuration files are read system-wide from /usr/local/etc/mplayer.conf -# and per-user from ~/.mplayer/config, where per-user settings override +# Configuration files are read system-wide from /usr/local/etc/mpv.conf +# and per-user from ~/.mpv/config, where per-user settings override # system-wide settings, all of which are overrriden by the command line. # # The configuration file settings are the same as the command line |