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