summaryrefslogtreecommitdiffstats
path: root/VERSION
diff options
context:
space:
mode:
authorMartin Herkt <lachs0r@srsfckn.biz>2015-12-11 18:33:38 +0100
committerMartin Herkt <lachs0r@srsfckn.biz>2015-12-11 18:33:38 +0100
commit0607dcebff1bfd9e1be534a58916045c32284e8d (patch)
treeebadce7def2db57813a90f4768e5f6ef7770e353 /VERSION
parenta33a44cf4e549ac8db4d703aaf51eb9aca00b6dc (diff)
parent3d12312806e7d54e7bb6b4b2a5981999735f6233 (diff)
downloadmpv-0607dcebff1bfd9e1be534a58916045c32284e8d.tar.bz2
mpv-0607dcebff1bfd9e1be534a58916045c32284e8d.tar.xz
Merge branch 'master' into release/current
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions