Uoti Urpala d5c868325c Merge svn changes up to r26979 ... Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c		2008-06-04 08:10:48 +03:00
..
qtxsdk	loader/qtx/qtxsdk/components.h: Disable large unused inline functions	2008-04-28 12:16:13 +03:00
list.c	Remove calls to Restore_LDT_Keeper, exit() is called immediately afterwards	2008-04-28 13:07:01 +00:00
qtxload.c	cosmetics: Remove pointless parentheses from return statements.	2008-05-16 09:31:55 +00:00