Merge svn changes up to r30514
commit173beb5608d893c0d9b42c1043f1dfa2db2e4df2
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 17:58:02 +0000 (9 19:58 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 17:58:02 +0000 (9 19:58 +0200)
tree9d91be39eb1a2edb2eec45d537630f518e04378a
parented0237e7d3c491282fbdc29c5ac294425055de57
parentc5b0ff1cfacfa502eb0647f329756ddf7c79fcb6
Merge svn changes up to r30514
Changelog
libvo/video_out.h
libvo/vo_gl.c
libvo/w32_common.c
libvo/x11_common.c
libvo/x11_common.h
loader/wrapper.S