diff options
author | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
commit | 0e81d62c53a205ce5a4a5b201c283a1f9aba7316 (patch) | |
tree | 9ce8f4b0444a765c6a5dce3cb84c528a0e4ca3df /TOOLS/osxbundle/mpv.app/Contents/PkgInfo | |
parent | bcf447d7e82af814ccc07c852543be38e58d69c8 (diff) | |
parent | 60cbc9461b86b13c68cc9537bc9a124ddc07a399 (diff) | |
download | mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.bz2 mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.xz |
Merge branch 'master' into osd_changes
Conflicts:
libvo/vo_xv.c
Diffstat (limited to 'TOOLS/osxbundle/mpv.app/Contents/PkgInfo')
-rw-r--r-- | TOOLS/osxbundle/mpv.app/Contents/PkgInfo | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/TOOLS/osxbundle/mpv.app/Contents/PkgInfo b/TOOLS/osxbundle/mpv.app/Contents/PkgInfo new file mode 100644 index 0000000000..bd04210fb4 --- /dev/null +++ b/TOOLS/osxbundle/mpv.app/Contents/PkgInfo @@ -0,0 +1 @@ +APPL????
\ No newline at end of file |