Public Git Hosting - mplayer.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 68e70b3 5eee463)

commit	de560e8167c21a8fd9ea34f5f42f377102d65232
author	Uoti Urpala <uau@symbol.nonexistent.invalid>
	Mon, 23 Jun 2008 00:58:44 +0000 (23 03:58 +0300)
committer	Uoti Urpala <uau@symbol.nonexistent.invalid>
	Mon, 23 Jun 2008 00:58:44 +0000 (23 03:58 +0300)
tree	d5ef49221ccbb17308b0d14a96e6bd8cfba5916f	tree \| snapshot (tar.gz zip)
parent	68e70b3ec34af2e1002d17d0dc81b3408a399ade	commit \| diff
parent	5eee4632d3e2bcf17a29483467d247c71c202e0d	commit \| diff

Merge svn changes up to r27123

Conflicts:

libmenu/menu_filesel.c
libmenu/menu_pt.c

15 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
cfg-common.h	diff1 \|	diff2 \|	blob \| history
command.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
input/input.c	diff1 \|	diff2 \|	blob \| history
input/input.h	diff1 \|	diff2 \|	blob \| history
libmenu/menu_filesel.c	diff1 \|	diff2 \|	blob \| history
libmenu/menu_pt.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demuxer.h	diff1 \|	diff2 \|	blob \| history
libvo/video_out.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_cvidix.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_gl.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_winvidix.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xvidix.c	diff1 \|	diff2 \|	blob \| history
libvo/vosub_vidix.c	diff1 \|	diff2 \|	blob \| history

MPlayer development branch