Public Git Hosting - mplayer/greg.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 626373a def2432)

commit	497c32cdadb9da9bc20a3650b3056e2657358136
author	Uoti Urpala <uau@glyph.nonexistent.invalid>
	Wed, 2 Jun 2010 15:55:18 +0000 (2 18:55 +0300)
committer	Uoti Urpala <uau@glyph.nonexistent.invalid>
	Wed, 2 Jun 2010 15:55:18 +0000 (2 18:55 +0300)
tree	ed3d48e5f9631d2951d8569b48a00d025c20ab08	tree \| snapshot (tar.gz zip)
parent	626373af3840220d40217b7bbe81f5fb452882bb	commit \| diff
parent	def243261a0b8e3ab0d043cd89b97f8c9826e573	commit \| diff

Merge svn changes up to r31291

Changelog	diff1 \|	diff2 \|	blob \| history
DOCS/man/en/mplayer.1	diff1 \|	diff2 \|	blob \| history
cfg-common-opts.h	diff1 \|	diff2 \|	blob \| history
cfg-common.h	diff1 \|	diff2 \|	blob \| history
cfg-mencoder.h	diff1 \|	diff2 \|	blob \| history
cfg-mplayer.h	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_ts.c	diff1 \|	diff2 \|	blob \| history
libvo/x11_common.c	diff1 \|	diff2 \|	blob \| history
stream/network.c	diff1 \|	diff2 \|	blob \| history