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

..

appleir.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

ar.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

ar.h

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

input.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

input.h

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

joystick.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

joystick.h

input: Remove separate mp_input_add_event_fd

2008-04-29 12:55:23 +03:00

lirc.c

litle bug, didn't compile :(

2006-10-12 23:48:52 +00:00

lirc.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

mouse.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00