diff options
author | Martin Herkt <lachs0r@srsfckn.biz> | 2015-10-29 02:56:49 +0100 |
---|---|---|
committer | Martin Herkt <lachs0r@srsfckn.biz> | 2015-10-29 02:56:49 +0100 |
commit | ec567d8a77da38a6b52f8a5469ebe899ff377da7 (patch) | |
tree | 385e5366a2cffee94ac9fa6d7e5661b66542c9d8 | |
parent | f8c57433b919d085b2674a7b3640be9beb2ab301 (diff) | |
parent | 33489feca868dfefbfb49510f2596d91932752f0 (diff) | |
download | mpv-ec567d8a77da38a6b52f8a5469ebe899ff377da7.tar.bz2 mpv-ec567d8a77da38a6b52f8a5469ebe899ff377da7.tar.xz |
Merge branch 'master' into release/current