summaryrefslogtreecommitdiffstats
path: root/VERSION
diff options
context:
space:
mode:
authorMartin Herkt <lachs0r@srsfckn.biz>2015-11-10 18:45:08 +0100
committerMartin Herkt <lachs0r@srsfckn.biz>2015-11-10 18:45:08 +0100
commit273607c1c6f77859e9a0cb98c3e4c74bc354fd8d (patch)
tree0fbd329857356bddf1d4dfbcf09ca4fbe2d6f0f9 /VERSION
parent5b7d0fbab31cb70d05bb7f757283c1ee4028b091 (diff)
parentfee45c01703ace0d6af7b8fe60d151be245a0e3f (diff)
downloadmpv-273607c1c6f77859e9a0cb98c3e4c74bc354fd8d.tar.bz2
mpv-273607c1c6f77859e9a0cb98c3e4c74bc354fd8d.tar.xz
Merge branch 'master' into release/current
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions