summaryrefslogtreecommitdiffstats
path: root/TOOLS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-15 17:29:06 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-02-16 18:16:36 +0900
commit23959eb5b485694188517d031cbfa60a8a231e8d (patch)
tree983b0e7ad9d7c9af3cf51cdc3539a37821261e77 /TOOLS
parent21a95f5ed98204c2b4cb5ca00ea8498f0db07a9e (diff)
downloadmpv-23959eb5b485694188517d031cbfa60a8a231e8d.tar.bz2
mpv-23959eb5b485694188517d031cbfa60a8a231e8d.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. (cherry picked from commit 816d7bba1f3842146fa12c98232070559e72e807)
Diffstat (limited to 'TOOLS')
-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