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
..
getch2-os2.c	Add a context for mp_fifo	2008-04-29 15:36:51 +03:00
getch2-win.c	Merge svn changes up to r26979	2008-06-04 08:10:48 +03:00
getch2.c	Add a context for mp_fifo	2008-04-29 15:36:51 +03:00
getch2.h	Add a context for mp_fifo	2008-04-29 15:36:51 +03:00
gettimeofday.c
glob-win.c
glob.h	Add missing header #includes to fix 'make checkheaders'.	2008-03-07 20:38:21 +00:00
keycodes.h	Add MPLAYER_ prefix to multiple inclusion guards.	2008-02-22 09:09:46 +00:00
macosx_finder_args.c
mmap_anon.c	mp_fifo.c, osdep/: Include corresponding .h in .c files	2008-04-29 14:52:45 +03:00
mmap_anon.h	Add MPLAYER_ prefix to multiple inclusion guards.	2008-02-22 09:09:46 +00:00
mmap-os2.c	mmap() support for OS/2	2008-02-27 22:29:52 +00:00
mmap.h	Add missing header #includes to fix 'make checkheaders'.	2008-03-07 20:38:21 +00:00
mplayer.rc	Use consistent include paths, we always build from the top level now.	2008-04-30 11:06:07 +00:00
setenv.c
shmem.c	Merge svn changes up to r26979	2008-06-04 08:10:48 +03:00
shmem.h	Add MPLAYER_ prefix to multiple inclusion guards.	2008-02-22 09:09:46 +00:00
strsep.c
swab.c
timer-darwin.c	Remove useless variable startup_time, since we do not need it any more.	2008-05-05 00:35:30 +00:00
timer-linux.c	Merge svn changes up to r26979	2008-06-04 08:10:48 +03:00
timer-win2.c	timers: Remove GetRelativeTime()	2008-04-28 12:18:45 +03:00
timer.h	osdep: Remove cruft	2008-04-28 12:18:48 +03:00
vsscanf.c