diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:34:30 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:34:30 +0200 |
commit | 5c6795a687cd9149e57985b632cf7a1c4a5c8310 (patch) | |
tree | 60f61ddbcd8aa96f04b9851029923d81d0b0be89 /libao2/ao_alsa.c | |
parent | 8a93561c8187058ae6278c9c6adb5ada7bedeff4 (diff) | |
parent | d7a1d12f6147b53944a56117feae66d8e0e52fb1 (diff) | |
download | mpv-5c6795a687cd9149e57985b632cf7a1c4a5c8310.tar.bz2 mpv-5c6795a687cd9149e57985b632cf7a1c4a5c8310.tar.xz |
Merge svn changes up to r30494
Conflicts:
libvo/vo_gl.c
libvo/x11_common.c
Diffstat (limited to 'libao2/ao_alsa.c')
0 files changed, 0 insertions, 0 deletions