diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-08-15 15:19:29 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-08-15 15:19:29 +0200 |
| commit | fd1bc95b4865ff789780c2213eefbdf77f0d4d1f (patch) | |
| tree | 639e098e46cf1b77ecea7df95d7b968c25e1d0c9 | |
| parent | 1e00bcc14c9b0d9beb8e152f958fc0db4bc6d31b (diff) | |
| parent | d7a7e9a8c861c4a9881fcef5cf69c746742b8b88 (diff) | |
| download | mpv-fd1bc95b4865ff789780c2213eefbdf77f0d4d1f.tar.bz2 mpv-fd1bc95b4865ff789780c2213eefbdf77f0d4d1f.tar.xz | |
Merge branch 'master' into release/current