Merge svn changes up to r30055
commitefcc9ad7120e01a17fc3659cb0229135b1cebb95
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Fri, 18 Dec 2009 16:54:42 +0000 (18 18:54 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Fri, 18 Dec 2009 16:54:42 +0000 (18 18:54 +0200)
treeeb15edb75377eedd5d7397209e8c0d594020663e
parent1598302be65c77c107330dc46fd0dabface3112d
parent8fcbe5835d038649e70da410d46c4f5cd502c261
Merge svn changes up to r30055
DOCS/man/en/mplayer.1
Makefile
configure
help/help_mp-en.h
libmpdemux/aviheader.c
libvo/font_load_ft.c
libvo/gl_common.c
libvo/gl_common.h
libvo/vo_corevideo.m
libvo/vo_gl.c
libvo/vo_gl2.c