summaryrefslogtreecommitdiffstats
path: root/TOOLS/osxbundle/mpv.app
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-15 17:29:06 +0100
committerwm4 <wm4@nowhere>2015-02-15 17:29:06 +0100
commit816d7bba1f3842146fa12c98232070559e72e807 (patch)
treedcedcb530d04781b1f5822a066e85dd5eee79923 /TOOLS/osxbundle/mpv.app
parenta27aa68dd33c613218d261b14ef1cf763abc1c33 (diff)
downloadmpv-816d7bba1f3842146fa12c98232070559e72e807.tar.bz2
mpv-816d7bba1f3842146fa12c98232070559e72e807.tar.xz
osxbundle: config file special case isn't needed anymore
The previous commit effectively fixes the mess caused by 'config' vs. 'mpv.conf', and the hack introduced by commit e01a6dac and extended by commit db167cd4 isn't needed anymore.
Diffstat (limited to 'TOOLS/osxbundle/mpv.app')
-rw-r--r--TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf (renamed from TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf)0
1 files changed, 0 insertions, 0 deletions
diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf
index ff78dfacf6..ff78dfacf6 100644
--- a/TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf
+++ b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf