summaryrefslogtreecommitdiffstats
path: root/VERSION
diff options
context:
space:
mode:
authorMartin Herkt <lachs0r@srsfckn.biz>2015-09-23 01:12:42 +0200
committerMartin Herkt <lachs0r@srsfckn.biz>2015-09-23 01:12:42 +0200
commitead2933792d6ad958c8ac2d50a0169c3c093ff2b (patch)
tree682e71897c514d537df387e30dc758b8e1bae044 /VERSION
parent181e1377b24498f1a335a5eeecf46907edae092a (diff)
parent79f8ee2808ebdf100d1a3aba9a853f801698a2ad (diff)
downloadmpv-ead2933792d6ad958c8ac2d50a0169c3c093ff2b.tar.bz2
mpv-ead2933792d6ad958c8ac2d50a0169c3c093ff2b.tar.xz
Merge branch 'master' into release/current
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions