diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:18:58 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:19:01 +0200 |
commit | a06b32b64e91082c11f747e2910f10a4afd3dfa9 (patch) | |
tree | 3028341d6fd07c19b8b7c78fdfd7c411cbdce573 /Makefile | |
parent | dc7f1830224e1953fb07ffcc045735b2b15af310 (diff) | |
parent | a3e355babf48e2c86652883cdb20e8fee5529276 (diff) | |
download | mpv-a06b32b64e91082c11f747e2910f10a4afd3dfa9.tar.bz2 mpv-a06b32b64e91082c11f747e2910f10a4afd3dfa9.tar.xz |
Merge svn changes up to r30108 (with "-s ours")
Skip more inferior external-libass support changes from svn.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions