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
..
14_4.c	…
28_8.c	…
cook.c	Merge svn changes up to r30663	2010-03-10 00:13:11 +02:00
drv2.c	…
drv3.c	…
drv4.c	…
ra.c	…
rv30.c	…
sipr.c	Merge svn changes up to r30663	2010-03-10 00:13:11 +02:00