Merge svn changes up to r28204
commitc1b80dcbbb34d63df65c0f52c0bede66dfa225e8
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Sat, 27 Dec 2008 15:40:57 +0000 (27 17:40 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Sat, 27 Dec 2008 15:40:57 +0000 (27 17:40 +0200)
tree2b929ffa6f2896bdee81729ceab2b9651c62055f
parenta76f59b0390a408de0a666cb1edfc578b734596a
parent4f6c6ba61a1fc213c7356b9ae1b9467f177a67a5
Merge svn changes up to r28204
Makefile
cfg-common-opts.h
common.mak
configure
libvo/vo_gl.c
libvo/vo_x11.c
libvo/x11_common.c