Uoti Urpala 17d3e4b36d Merge svn changes up to r27441 ...

Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h

2008-08-08 02:13:09 +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 r27441

2008-08-08 02:13:09 +03:00

input.h

Merge svn changes up to r27123

2008-06-23 03:58:44 +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

…

lirc.h

…

mouse.h

…