diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-04-11 17:42:55 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-04-11 17:42:55 +0200 |
| commit | 0803f4ad21c195519209bae8d18840dd810191f8 (patch) | |
| tree | f9a869011ba90c106cf5c05c3e346912a669f63a | |
| parent | 9d2980dab752280468620df49cabe7f4843f0551 (diff) | |
| parent | b968d779afb9114694976792e903b0591a71a816 (diff) | |
| download | mpv-0803f4ad21c195519209bae8d18840dd810191f8.tar.bz2 mpv-0803f4ad21c195519209bae8d18840dd810191f8.tar.xz | |
Merge branch 'master' into release/current