summaryrefslogtreecommitdiffstats
path: root/VERSION
diff options
context:
space:
mode:
authorMartin Herkt <lachs0r@srsfckn.biz>2016-08-15 15:19:29 +0200
committerMartin Herkt <lachs0r@srsfckn.biz>2016-08-15 15:19:29 +0200
commitfd1bc95b4865ff789780c2213eefbdf77f0d4d1f (patch)
tree639e098e46cf1b77ecea7df95d7b968c25e1d0c9 /VERSION
parent1e00bcc14c9b0d9beb8e152f958fc0db4bc6d31b (diff)
parentd7a7e9a8c861c4a9881fcef5cf69c746742b8b88 (diff)
downloadmpv-fd1bc95b4865ff789780c2213eefbdf77f0d4d1f.tar.bz2
mpv-fd1bc95b4865ff789780c2213eefbdf77f0d4d1f.tar.xz
Merge branch 'master' into release/current
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions