summaryrefslogtreecommitdiffstats
path: root/loader/resource.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-07-07 02:35:18 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-07-07 02:35:51 +0300
commit0c2773a709276681575d2507aa60ee85c2d0b850 (patch)
tree71cb9bd9ed121156d3382066c0722c73189afe04 /loader/resource.c
parent0eb321bf2c1cc0e048faff26a01f86cdd3ec254f (diff)
parent6e9cbdc10448203e7c8b2de41447442fcc9f7bae (diff)
downloadmpv-0c2773a709276681575d2507aa60ee85c2d0b850.tar.bz2
mpv-0c2773a709276681575d2507aa60ee85c2d0b850.tar.xz
Merge svn r29305 (trailing whitespace removal)
This merge doesn't actually modify the tree, it's only here to tell git that later merges should not try to apply the whitespace changes (which would produce lots of conflicts).
Diffstat (limited to 'loader/resource.c')
0 files changed, 0 insertions, 0 deletions