Merge svn changes up to r28149
commita3ab9e8e4649601281f78949e56b92755ae1142a
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Sun, 14 Dec 2008 15:28:16 +0000 (14 17:28 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Sun, 14 Dec 2008 15:28:16 +0000 (14 17:28 +0200)
treee31ee1ff4bafbfcf75c16259d9a64d18fea3bd51
parentf01f7f6259badb2725be49af914d8db52e025cf6
parentbac1f05b4da4339b487e4e6ab972819142b3f13e
Merge svn changes up to r28149
27 files changed:
DOCS/man/en/mplayer.1
DOCS/man/fr/mplayer.1
configure
help/help_mp-en.h
input/input.c
input/input.h
input/joystick.c
input/joystick.h
libmenu/menu.c
libmenu/menu.h
libmenu/menu_cmdlist.c
libmenu/menu_console.c
libmenu/menu_dvbin.c
libmenu/menu_filesel.c
libmenu/menu_param.c
libmenu/menu_pt.c
libmenu/vf_menu.c
libmpcodecs/ad_faad.c
libmpcodecs/ve_qtvideo.c
libmpdemux/parse_mp4.c
libvo/gl_common.h
libvo/mga_common.c
libvo/vo_direct3d.c
libvo/vo_gl.c
libvo/vo_macosx.m
libvo/vo_png.c
libvo/vo_quartz.c