Merge svn changes up to r27979
commit6cbca28085f1698bc7c6537631d5efbadf64abf1
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Sat, 22 Nov 2008 17:16:43 +0000 (22 19:16 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Sat, 22 Nov 2008 17:16:43 +0000 (22 19:16 +0200)
tree13a3ad21a732b168399ce9b34bbb0a57784dd54e
parent1715c2a33632b333f8e8e581ef23ea5fe0234edd
parenta83e00009000c4907254daa141d491d0479e961d
Merge svn changes up to r27979
13 files changed:
DOCS/man/en/mplayer.1
configure
help/help_mp-en.h
libvo/video_out.c
libvo/vo_gl.c
libvo/vo_gl2.c
libvo/vo_x11.c
libvo/vo_xover.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/w32_common.c
libvo/x11_common.c