summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 23:37:00 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 23:37:00 +0200
commit42bf12c2d3b2903a127f625dea0d3516a87debfa (patch)
tree7fe1a2c4a3c250d44b9ff2a8bdf3809104744eb9 /README
parentfa34ea27b94cd870ec56de4ce215bf797054119f (diff)
parent3c514ea708749679623ae04fc8f7ade87e51aade (diff)
downloadmpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.bz2
mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.xz
Merge svn changes up to r30595
Conflicts: mplayer.c vidix/nvidia_vid.c
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions