Merge svn changes up to r28103
commitcb3dc68691f4d01426c7abdd9e7bc16f8d461a9f
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Sat, 6 Dec 2008 00:16:51 +0000 (6 02:16 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Sat, 6 Dec 2008 00:16:51 +0000 (6 02:16 +0200)
tree66106f966a36721c37c1e22221e85110cbefa255
parent8c144171bb80dd3d1f7161b97675e78cad00bc65
parentc6ef66231818b90c75f84b9407730647c93f040c
Merge svn changes up to r28103
DOCS/man/en/mplayer.1
DOCS/man/fr/mplayer.1
input/input.h
libvo/gl_common.c
libvo/gl_common.h
libvo/vo_gl.c
libvo/x11_common.c