Merge branch 'pause'
commit02bc48b67dd88c974c8f9298a0c50cbfcd51af41
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Wed, 14 Jan 2009 22:29:51 +0000 (15 00:29 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Wed, 14 Jan 2009 22:29:51 +0000 (15 00:29 +0200)
tree9e826e3d0494ce20cc115d85866f3e7472e21d60
parentc1b80dcbbb34d63df65c0f52c0bede66dfa225e8
parent38a76f7fdf5c03bc49072b693d7c53b343f2994a
Merge branch 'pause'
libvo/video_out.h
libvo/vo_gl.c