summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-12-29 23:59:08 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-12-30 00:03:48 +0200
commit0f81e5f9732d143ab47c9b03dfd528f3a0af4aea (patch)
treed68ea94ae2d712cb2e991496049bc13f19d9ea60 /etc
parent67b40bd21988fed2f70b1c4f5aea301b28f78298 (diff)
parentbfd01bdc1700bac53392dc827f3f7870124d0406 (diff)
downloadmpv-0f81e5f9732d143ab47c9b03dfd528f3a0af4aea.tar.bz2
mpv-0f81e5f9732d143ab47c9b03dfd528f3a0af4aea.tar.xz
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 'etc')
0 files changed, 0 insertions, 0 deletions