Uoti Urpala 13221a7165 Merge svn changes up to r30663 ...

Conflicts:
	gui/cfg.c
	libmpcodecs/vd_dmo.c
	mplayer.c

2010-03-10 00:13:11 +02:00

..

menu_chapsel.c

…

menu_cmdlist.c

…

menu_console.c

…

menu_dvbin.c

…

menu_filesel.c

Merge svn changes up to r30663

2010-03-10 00:13:11 +02:00

menu_list.c

…

menu_list.h

…

menu_param.c

…

menu_pt.c

…

menu_txt.c

…

menu.c

Merge svn changes up to r30643

2010-03-10 00:00:06 +02:00

menu.h

Merge svn changes up to r30595

2010-03-09 23:37:00 +02:00

vf_menu.c

…