summaryrefslogtreecommitdiffstats
path: root/libao2
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-07-25 02:14:16 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-07-25 02:50:58 +0300
commit3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (patch)
tree1ba215c9978eadcd6b99b2c696b22ea6a3779e33 /libao2
parent577587ec6ce8dad59c303a76cba03af03db879a3 (diff)
parent901574e3bf6ff45a46a12dc7884a93970f9d58d1 (diff)
downloadmpv-3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d.tar.bz2
mpv-3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d.tar.xz
Merge svn changes up to r27347
Conflicts: libvo/x11_common.c libvo/x11_common.h Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts with the global variable "vo_border"; done in the merge commit because uses of the macro needed changes anyway to resolve conflicts.
Diffstat (limited to 'libao2')
0 files changed, 0 insertions, 0 deletions