Merge svn changes up to r27242
commitca3feba5c339f12141bf335e5592967caccc290b
authorUoti Urpala <uau@symbol.nonexistent.invalid>
Wed, 9 Jul 2008 15:32:51 +0000 (9 18:32 +0300)
committerUoti Urpala <uau@symbol.nonexistent.invalid>
Wed, 9 Jul 2008 15:32:51 +0000 (9 18:32 +0300)
tree06ec4960d34fd7a50c6efb80f8e017b2f4ab5d99
parent8ea134bd23022afbe1a06c0241c0c2c6ea2618f8
parent8760b0cb71dc6aa9c08d926712e64218931a1782
Merge svn changes up to r27242

Conflicts:

Makefile
configure
Makefile
configure
libvo/vo_gl.c
stream/stream.c