From 816d7bba1f3842146fa12c98232070559e72e807 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 15 Feb 2015 17:29:06 +0100 Subject: 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. --- TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf | 3 +++ TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf delete mode 100644 TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf (limited to 'TOOLS/osxbundle') diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf new file mode 100644 index 0000000000..ff78dfacf6 --- /dev/null +++ b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf @@ -0,0 +1,3 @@ +screenshot-template=~/Desktop/shot%n +quiet +idle=once diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf b/TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf deleted file mode 100644 index ff78dfacf6..0000000000 --- a/TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf +++ /dev/null @@ -1,3 +0,0 @@ -screenshot-template=~/Desktop/shot%n -quiet -idle=once -- cgit v1.2.3