diff options
author | 2009-12-29 23:59:08 +0200 | |
---|---|---|
committer | 2009-12-30 00:03:48 +0200 | |
commit | 0f81e5f9732d143ab47c9b03dfd528f3a0af4aea (patch) | |
tree | d68ea94ae2d712cb2e991496049bc13f19d9ea60 /mp_osd.h | |
parent | 67b40bd21988fed2f70b1c4f5aea301b28f78298 (diff) | |
parent | bfd01bdc1700bac53392dc827f3f7870124d0406 (diff) |
Merge svn changes up to r30068 (skip libass changes)
Mark inferior external libass support implementation from svn merged
with "-s ours" (no actual changes to the tree). This tree already
contains a better implementation.
Diffstat (limited to 'mp_osd.h')
0 files changed, 0 insertions, 0 deletions