Public Git Hosting - mplayer.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 92e5414 82118dc)

commit	fe69b49ccc2bb3e00977f4110a59ffe3b0516d6f
author	Uoti Urpala <uau@mplayer2.org>
	Tue, 6 Dec 2011 22:13:51 +0000 (7 00:13 +0200)
committer	Uoti Urpala <uau@mplayer2.org>
	Tue, 6 Dec 2011 22:13:51 +0000 (7 00:13 +0200)
tree	c78705f95df4143bc28d19db6ad36df2ab2cf215	tree \| snapshot (tar.gz zip)
parent	92e5414897707d998b4ba46664709347760f5b11	commit \| diff
parent	82118dc35edfbf9b6714e1e4e6b1823fc3205ff7	commit \| diff

Merge remote-tracking branch 'wm4/window_title'

libmpcodecs/vf_vo.c	diff1 \|	diff2 \|	blob \| history
libvo/video_out.c	diff1 \|	diff2 \|	blob \| history
libvo/video_out.h	diff1 \|	diff2 \|	blob \| history
libvo/vo_gl.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_vdpau.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xv.c	diff1 \|	diff2 \|	blob \| history

MPlayer development branch